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 queryDomainUserRelInfo(Map 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 result = new ArrayList<>(); - try { //获取订阅该领域的所有用户信息 - QueryWrapper queryDomain = new QueryWrapper<>(); - queryDomain.lambda().eq(DomainUserRel::getDomainId,domainId); - List domainUserRelList = super.baseMapper.selectList(queryDomain); - if(CollectionUtils.isNotEmpty(domainUserRelList)){ - result = domainUserRelList.stream().map(DomainUserRel::getUserId).distinct().collect(Collectors.toList()); + if(StringUtils.isNotEmpty(domainId)){ + QueryWrapper queryDomain = new QueryWrapper<>(); + queryDomain.lambda().eq(DomainUserRel::getDomainId,domainId); + List domainUserRelList = super.baseMapper.selectList(queryDomain); + if(CollectionUtils.isNotEmpty(domainUserRelList)){ + result = domainUserRelList.stream().map(DomainUserRel::getUserId).distinct().collect(Collectors.toList()); + } } //获取该文档所有订阅用户的信息 - QueryWrapper querySubscribe = new QueryWrapper<>(); - querySubscribe.lambda().eq(OnlCgformSubscribe::getDocumentId,documentId); - List onlCgformSubscribeList = onlCgformSubscribeMapper.selectList(querySubscribe); - if(CollectionUtils.isNotEmpty(onlCgformSubscribeList)){ - List userNameList = onlCgformSubscribeList.stream().map(OnlCgformSubscribe::getCreateBy).distinct().collect(Collectors.toList()); + if(StringUtils.isNotEmpty(documentId)){ + QueryWrapper querySubscribe = new QueryWrapper<>(); + querySubscribe.lambda().eq(OnlCgformSubscribe::getDocumentId,documentId); + List onlCgformSubscribeList = onlCgformSubscribeMapper.selectList(querySubscribe); + if(CollectionUtils.isNotEmpty(onlCgformSubscribeList)){ + List userNameList = onlCgformSubscribeList.stream().map(OnlCgformSubscribe::getCreateBy).distinct().collect(Collectors.toList()); - QueryWrapper userQuery = new QueryWrapper<>(); - userQuery.lambda().in(SysUser::getUsername,userNameList); - List sysUsers = this.sysUserMapper.selectList(userQuery); - if(CollectionUtils.isNotEmpty(sysUsers)){ - for (SysUser sysUser : sysUsers) { - if(!result.contains(sysUser.getId())){ - result.add(sysUser.getId()); + QueryWrapper userQuery = new QueryWrapper<>(); + userQuery.lambda().in(SysUser::getUsername,userNameList); + List sysUsers = this.sysUserMapper.selectList(userQuery); + if(CollectionUtils.isNotEmpty(sysUsers)){ + for (SysUser sysUser : sysUsers) { + if(!result.contains(sysUser.getId())){ + result.add(sysUser.getId()); + } } } }