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