From 745d27feae34022ccb708aba034123e08e4e9e14 Mon Sep 17 00:00:00 2001
From: 1098226878@qq.com <1098226878@qq.com>
Date: 星期二, 28 十二月 2021 22:21:16 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 service-user/src/main/java/com/java110/user/cmd/owner/OwnerCommunityCmd.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/service-user/src/main/java/com/java110/user/cmd/owner/OwnerCommunityCmd.java b/service-user/src/main/java/com/java110/user/cmd/owner/OwnerCommunityCmd.java
index e367ef3..68577b7 100644
--- a/service-user/src/main/java/com/java110/user/cmd/owner/OwnerCommunityCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/owner/OwnerCommunityCmd.java
@@ -56,7 +56,7 @@
         ownerDto.setLink(reqJson.getString("link"));
         List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwnerMembers(ownerDto);
 
-        if (ownerDtos == null || ownerDtos.size() < 0) {
+        if (ownerDtos == null || ownerDtos.size() < 1) {
             cmdDataFlowContext.setResponseEntity(ResultVo.success());
             return;
         }
@@ -64,12 +64,17 @@
         List<String> communityIds = new ArrayList<>();
         for (OwnerDto tmpOwnerDto : ownerDtos) {
             communityIds.add(tmpOwnerDto.getCommunityId());
+            tmpOwnerDto.setAppUserName(tmpOwnerDto.getName());
         }
 
         CommunityDto communityDto = new CommunityDto();
         communityDto.setState("1100");
         communityDto.setCommunityIds(communityIds.toArray(new String[communityIds.size()]));
         List<CommunityDto> communityDtos = communityInnerServiceSMOImpl.queryCommunitys(communityDto);
+        if(communityDtos == null || communityDtos.size()<1){
+            cmdDataFlowContext.setResponseEntity(ResultVo.success());
+            return ;
+        }
         for (OwnerDto tmpOwnerDto : ownerDtos) {
             for (CommunityDto tmpCommunityDto : communityDtos) {
                 if (!tmpCommunityDto.getCommunityId().equals(tmpOwnerDto.getCommunityId())) {

--
Gitblit v1.8.0