queryDomainUserRelInfo方法修改。

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,26 +89,21 @@ 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 {
             //获取订阅该领域的所有用户信息
+            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());
                 }
+            }
 
             //获取该文档所有订阅用户的信息
+            if(StringUtils.isNotEmpty(documentId)){
                 QueryWrapper<OnlCgformSubscribe> querySubscribe = new QueryWrapper<>();
                 querySubscribe.lambda().eq(OnlCgformSubscribe::getDocumentId,documentId);
                 List<OnlCgformSubscribe> onlCgformSubscribeList = onlCgformSubscribeMapper.selectList(querySubscribe);
@@ -125,6 +121,7 @@ public class DomainManageServiceImpl extends ServiceImpl<DomainUserRelMapper, Do
                         }
                     }
                 }
+            }
         }catch (Exception ex){
             log.error("根据领域id、文档id查询用户失败：" + ex.getMessage());
             throw new JeroBootException("根据领域id、文档id查询用户失败！");