From e40889177c25035496c526dbc12a9665d5b61ceb Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 20 三月 2025 12:00:53 +0800
Subject: [PATCH] 优化小区房屋和小区业主 支持按小区查询数据

---
 service-user/src/main/java/com/java110/user/cmd/owner/QueryCurrentOwnerCmd.java |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/service-user/src/main/java/com/java110/user/cmd/owner/QueryCurrentOwnerCmd.java b/service-user/src/main/java/com/java110/user/cmd/owner/QueryCurrentOwnerCmd.java
index 3824251..39e47b5 100644
--- a/service-user/src/main/java/com/java110/user/cmd/owner/QueryCurrentOwnerCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/owner/QueryCurrentOwnerCmd.java
@@ -14,6 +14,8 @@
 import com.java110.intf.user.IOwnerV1InnerServiceSMO;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
+import com.java110.utils.util.ListUtil;
+import com.java110.utils.util.StringUtil;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -73,15 +75,23 @@
         OwnerAppUserDto ownerAppUserDto = new OwnerAppUserDto();
         ownerAppUserDto.setUserId(userId);
         ownerAppUserDto.setCommunityId(reqJson.getString("communityId"));
+        //ownerAppUserDto.setMemberId(reqJson.getString("memberId"));
         List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserInnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);
 
-        if (ownerAppUserDtos == null || ownerAppUserDtos.size() < 1) {
+        if (ListUtil.isNull(ownerAppUserDtos)) {
             throw new CmdException("鏈粦瀹氫笟涓�");
         }
 
-        String memberId = ownerAppUserDtos.get(0).getMemberId();
+        String memberId = "";
+        for (OwnerAppUserDto tmpOwnerAppUserDto : ownerAppUserDtos) {
+            if ("-1".equals(tmpOwnerAppUserDto.getMemberId())) {
+                continue;
+            }
 
-        if ("-1".equals(memberId)) {
+            memberId = tmpOwnerAppUserDto.getMemberId();
+        }
+
+        if (StringUtil.isEmpty(memberId)) {
             throw new CmdException("鏈粦瀹氫笟涓�");
         }
 

--
Gitblit v1.8.0