From 45102fc13900aad6d117b00a4feeeafe9c3f5fee Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 27 五月 2025 21:04:09 +0800
Subject: [PATCH] 优化查询业主成员

---
 service-user/src/main/java/com/java110/user/cmd/owner/DeleteOwnerMemberCmd.java |   24 ++++++++++++++++++++++--
 1 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/service-user/src/main/java/com/java110/user/cmd/owner/DeleteOwnerMemberCmd.java b/service-user/src/main/java/com/java110/user/cmd/owner/DeleteOwnerMemberCmd.java
index 29222ec..61275e1 100644
--- a/service-user/src/main/java/com/java110/user/cmd/owner/DeleteOwnerMemberCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/owner/DeleteOwnerMemberCmd.java
@@ -3,6 +3,7 @@
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.CmdContextUtils;
 import com.java110.core.context.Environment;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
@@ -16,9 +17,12 @@
 import com.java110.intf.user.*;
 import com.java110.po.owner.OwnerAppUserPo;
 import com.java110.po.owner.OwnerPo;
+import com.java110.user.cmd.question.ListUserQuestionAnswerCmd;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.ListUtil;
+import com.java110.utils.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.List;
@@ -79,6 +83,22 @@
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
         Environment.isDevEnv();
+
+        String userId = CmdContextUtils.getUserId(cmdDataFlowContext);
+
+        OwnerAppUserDto ownerAppUserDto = new OwnerAppUserDto();
+        ownerAppUserDto.setUserId(userId);
+        ownerAppUserDto.setCommunityId(reqJson.getString("communityId"));
+        List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserV1InnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);
+
+        if (ListUtil.isNull(ownerAppUserDtos)) {
+            throw new CmdException("涓氫富涓嶅瓨鍦�");
+        }
+
+        if (StringUtil.isEmpty(ownerAppUserDtos.get(0).getMemberId())) {
+            throw new CmdException("涓氫富涓嶅瓨鍦�");
+        }
+
         Assert.jsonObjectHaveKey(reqJson, "memberId", "璇锋眰鎶ユ枃涓湭鍖呭惈memberId");
         Assert.jsonObjectHaveKey(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId");
 
@@ -86,8 +106,8 @@
         OwnerDto ownerDto = new OwnerDto();
         ownerDto.setMemberId(reqJson.getString("memberId"));
         ownerDto.setCommunityId(reqJson.getString("communityId"));
-        ownerDto.setOwnerTypeCds(new String[]{OwnerDto.OWNER_TYPE_CD_MEMBER, OwnerDto.OWNER_TYPE_CD_RENTING,
-                OwnerDto.OWNER_TYPE_CD_TEMP, OwnerDto.OWNER_TYPE_CD_OTHER});
+        ownerDto.setOwnerId(ownerAppUserDtos.get(0).getMemberId());
+        ownerDto.setOwnerTypeCds(new String[]{OwnerDto.OWNER_TYPE_CD_MEMBER});
 
         List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwnerMembers(ownerDto);
 

--
Gitblit v1.8.0