From 5589528feb385d7881f8dbf9314b3abf5d4f4e9e Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期五, 27 一月 2023 19:21:11 +0800
Subject: [PATCH] 优化 房屋页面查询功能

---
 service-community/src/main/java/com/java110/community/cmd/ownerRepair/ListOwnerRepairsCmd.java |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 deletions(-)

diff --git a/service-community/src/main/java/com/java110/community/cmd/ownerRepair/ListOwnerRepairsCmd.java b/service-community/src/main/java/com/java110/community/cmd/ownerRepair/ListOwnerRepairsCmd.java
index 08db4be..76488a5 100644
--- a/service-community/src/main/java/com/java110/community/cmd/ownerRepair/ListOwnerRepairsCmd.java
+++ b/service-community/src/main/java/com/java110/community/cmd/ownerRepair/ListOwnerRepairsCmd.java
@@ -6,13 +6,16 @@
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.dto.file.FileRelDto;
+import com.java110.dto.owner.OwnerDto;
 import com.java110.dto.repair.RepairDto;
 import com.java110.dto.repair.RepairUserDto;
 import com.java110.intf.common.IFileRelInnerServiceSMO;
 import com.java110.intf.community.IRepairInnerServiceSMO;
 import com.java110.intf.community.IRepairUserInnerServiceSMO;
+import com.java110.intf.user.IOwnerV1InnerServiceSMO;
 import com.java110.utils.cache.MappingCache;
 import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.utils.util.StringUtil;
 import com.java110.vo.ResultVo;
@@ -38,13 +41,21 @@
     @Autowired
     private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
 
+    @Autowired
+    private IOwnerV1InnerServiceSMO ownerV1InnerServiceSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
         super.validatePageInfo(reqJson);
+        Assert.hasKeyAndValue(reqJson, "communityId", "蹇呭~锛岃濉啓灏忓尯淇℃伅");
+
     }
 
     @Override
     public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
+
+        hasOwnerId(reqJson);
+
         RepairDto ownerRepairDto = BeanConvertUtil.covertBean(reqJson, RepairDto.class);
 
         if (!StringUtil.isEmpty(ownerRepairDto.getRoomId()) && ownerRepairDto.getRoomId().contains(",")) {
@@ -108,6 +119,18 @@
         context.setResponseEntity(responseEntity);
     }
 
+    private void hasOwnerId(JSONObject reqJson) {
+        if(reqJson.containsKey("ownerId") && !StringUtil.isEmpty(reqJson.getString("ownerId"))){
+            OwnerDto ownerDto = new OwnerDto();
+            ownerDto.setMemberId(reqJson.getString("ownerId"));
+            ownerDto.setCommunityId(reqJson.getString("communityId"));
+            List<OwnerDto> ownerDtos = ownerV1InnerServiceSMOImpl.queryOwners(ownerDto);
+            if(ownerDtos != null && ownerDtos.size() > 0){
+                reqJson.put("tel",ownerDtos.get(0).getLink());
+            }
+        }
+    }
+
     private void refreshRepair(List<RepairDto> ownerRepairs) {
 
         List<String> repairIds = new ArrayList<>();

--
Gitblit v1.8.0