From e52ddfe8caf7d0027950033a5aff2a1fd3482e9d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 01 六月 2022 17:50:25 +0800
Subject: [PATCH] 优化装修 跟踪记录 回显
---
service-user/src/main/java/com/java110/user/cmd/owner/QueryOwnersCmd.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/owner/QueryOwnersCmd.java b/service-user/src/main/java/com/java110/user/cmd/owner/QueryOwnersCmd.java
index 4402907..32c3738 100644
--- a/service-user/src/main/java/com/java110/user/cmd/owner/QueryOwnersCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/owner/QueryOwnersCmd.java
@@ -52,7 +52,8 @@
//鏍规嵁鎴垮眿鏌ヨ鏃� 鍏堢敤 鎴垮眿淇℃伅鏌ヨ 涓氫富ID
freshRoomId(reqJson);
- if (reqJson.containsKey("name")) {
+
+ if (reqJson.containsKey("name") && !StringUtil.isEmpty(reqJson.getString("name"))) {
queryByCondition(reqJson, cmdDataFlowContext);
return;
}
@@ -134,14 +135,20 @@
*/
private void queryByCondition(JSONObject reqJson, ICmdDataFlowContext cmdDataFlowContext) {
//鑾峰彇褰撳墠鐢ㄦ埛id
+ String ownerTypeCd = reqJson.getString("ownerTypeCd");
+ OwnerDto tmpOwnerDto = BeanConvertUtil.covertBean(reqJson, OwnerDto.class);
+ if(!StringUtil.isEmpty(ownerTypeCd) && ownerTypeCd.contains(",")){
+ tmpOwnerDto.setOwnerTypeCd("");
+ tmpOwnerDto.setOwnerTypeCds(ownerTypeCd.split(","));
+ }
String userId = reqJson.getString("userId");
int row = reqJson.getInteger("row");
ApiOwnerVo apiOwnerVo = new ApiOwnerVo();
- int total = ownerInnerServiceSMOImpl.queryOwnerCountByCondition(BeanConvertUtil.covertBean(reqJson, OwnerDto.class));
+ int total = ownerInnerServiceSMOImpl.queryOwnerCountByCondition(tmpOwnerDto);
apiOwnerVo.setTotal(total);
List<OwnerDto> ownerDtos = new ArrayList<>();
if (total > 0) {
- List<OwnerDto> ownerDtoList = ownerInnerServiceSMOImpl.queryOwnersByCondition(BeanConvertUtil.covertBean(reqJson, OwnerDto.class));
+ List<OwnerDto> ownerDtoList = ownerInnerServiceSMOImpl.queryOwnersByCondition(tmpOwnerDto);
List<Map> mark = getPrivilegeOwnerList("/roomCreateFee", userId);
for (OwnerDto ownerDto : ownerDtoList) {
//瀵逛笟涓昏韩浠借瘉鍙烽殣钘忓鐞�
--
Gitblit v1.8.0