queryDomainUserRelInfo方法修改。

This commit is contained in:
wangzhijiang
2022-03-03 15:43:43 +08:00
parent 92f69cc248
commit 6498399734
@@ -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());
}
}
}
}