From 64983997340ae3ab4b7fce39fc8be0381ffded10 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Thu, 3 Mar 2022 15:43:43 +0800
Subject: [PATCH] =?UTF-8?q?queryDomainUserRelInfo=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DomainManageServiceImpl.java | 47 +++++++++----------
 1 file changed, 22 insertions(+), 25 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/domain/service/impl/DomainManageServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/domain/service/impl/DomainManageServiceImpl.java
index 4a78956e9..c1754df58 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/domain/service/impl/DomainManageServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/domain/service/impl/DomainManageServiceImpl.java
@@ -14,6 +14,7 @@ import com.jero.modules.subscribe.entity.OnlCgformSubscribe;
 import com.jero.modules.subscribe.mapper.OnlCgformSubscribeMapper;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.mapper.SysUserMapper;
+import me.zhyd.oauth.utils.StringUtils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -88,39 +89,35 @@ public class DomainManageServiceImpl extends ServiceImpl<DomainUserRelMapper, Do
     @Override
     public List<String> queryDomainUserRelInfo(Map<String, Object> params) {
         String domainId = (String) params.get("domainId");
-        if(oConvertUtils.isEmpty(domainId)){
-            throw new JeroBootException("领域id不能为空！");
-        }
         String documentId = (String) params.get("documentId");
-        if(oConvertUtils.isEmpty(documentId)){
-            throw new JeroBootException("文档id不能为空");
-        }
-
         List<String> result = new ArrayList<>();
-
         try {
             //获取订阅该领域的所有用户信息
-            QueryWrapper<DomainUserRel> queryDomain = new QueryWrapper<>();
-            queryDomain.lambda().eq(DomainUserRel::getDomainId,domainId);
-            List<DomainUserRel> domainUserRelList = super.baseMapper.selectList(queryDomain);
-            if(CollectionUtils.isNotEmpty(domainUserRelList)){
-                result = domainUserRelList.stream().map(DomainUserRel::getUserId).distinct().collect(Collectors.toList());
+            if(StringUtils.isNotEmpty(domainId)){
+                QueryWrapper<DomainUserRel> queryDomain = new QueryWrapper<>();
+                queryDomain.lambda().eq(DomainUserRel::getDomainId,domainId);
+                List<DomainUserRel> domainUserRelList = super.baseMapper.selectList(queryDomain);
+                if(CollectionUtils.isNotEmpty(domainUserRelList)){
+                    result = domainUserRelList.stream().map(DomainUserRel::getUserId).distinct().collect(Collectors.toList());
+                }
             }
 
             //获取该文档所有订阅用户的信息
-            QueryWrapper<OnlCgformSubscribe> querySubscribe = new QueryWrapper<>();
-            querySubscribe.lambda().eq(OnlCgformSubscribe::getDocumentId,documentId);
-            List<OnlCgformSubscribe> onlCgformSubscribeList = onlCgformSubscribeMapper.selectList(querySubscribe);
-            if(CollectionUtils.isNotEmpty(onlCgformSubscribeList)){
-                List<String> userNameList = onlCgformSubscribeList.stream().map(OnlCgformSubscribe::getCreateBy).distinct().collect(Collectors.toList());
+            if(StringUtils.isNotEmpty(documentId)){
+                QueryWrapper<OnlCgformSubscribe> querySubscribe = new QueryWrapper<>();
+                querySubscribe.lambda().eq(OnlCgformSubscribe::getDocumentId,documentId);
+                List<OnlCgformSubscribe> onlCgformSubscribeList = onlCgformSubscribeMapper.selectList(querySubscribe);
+                if(CollectionUtils.isNotEmpty(onlCgformSubscribeList)){
+                    List<String> userNameList = onlCgformSubscribeList.stream().map(OnlCgformSubscribe::getCreateBy).distinct().collect(Collectors.toList());
 
-                QueryWrapper<SysUser> userQuery = new QueryWrapper<>();
-                userQuery.lambda().in(SysUser::getUsername,userNameList);
-                List<SysUser> sysUsers = this.sysUserMapper.selectList(userQuery);
-                if(CollectionUtils.isNotEmpty(sysUsers)){
-                    for (SysUser sysUser : sysUsers) {
-                        if(!result.contains(sysUser.getId())){
-                            result.add(sysUser.getId());
+                    QueryWrapper<SysUser> userQuery = new QueryWrapper<>();
+                    userQuery.lambda().in(SysUser::getUsername,userNameList);
+                    List<SysUser> sysUsers = this.sysUserMapper.selectList(userQuery);
+                    if(CollectionUtils.isNotEmpty(sysUsers)){
+                        for (SysUser sysUser : sysUsers) {
+                            if(!result.contains(sysUser.getId())){
+                                result.add(sysUser.getId());
+                            }
                         }
                     }
                 }