fix
This commit is contained in:
+5
-14
@@ -232,20 +232,11 @@ public class SysMessageNoticeServiceImpl extends ServiceImpl<SysMessageNoticeMap
|
|||||||
*/
|
*/
|
||||||
private List<String> getAccessibleNoticeIds(LoginUser loginUser) {
|
private List<String> getAccessibleNoticeIds(LoginUser loginUser) {
|
||||||
LambdaQueryWrapper<SysMessageNoticeScope> scopeWrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<SysMessageNoticeScope> scopeWrapper = new LambdaQueryWrapper<>();
|
||||||
scopeWrapper.select(SysMessageNoticeScope::getNoticeId)
|
List<String> scopes = new ArrayList<>();
|
||||||
.eq(SysMessageNoticeScope::getScopeId, loginUser.getId())
|
scopes.add(loginUser.getId());
|
||||||
.or()
|
scopes.addAll(GlobalUtils.getOrgCodeTreeByCode(loginUser.getOrgCode()));
|
||||||
.likeRight(SysMessageNoticeScope::getScopeId,
|
scopeWrapper.select(SysMessageNoticeScope::getNoticeId);
|
||||||
sysCache.getDepartByOrgCode(GlobalUtils.getFirstDepartOrgCode(loginUser.getOrgCode())).getOrgCode())
|
scopeWrapper.in(SysMessageNoticeScope::getScopeId, scopes);
|
||||||
.or()
|
|
||||||
.likeRight(SysMessageNoticeScope::getScopeId,
|
|
||||||
sysCache.getDepartByOrgCode(GlobalUtils.getSecondDepartOrgCode(loginUser.getOrgCode())).getOrgCode())
|
|
||||||
.or()
|
|
||||||
.likeRight(SysMessageNoticeScope::getScopeId,
|
|
||||||
sysCache.getDepartByOrgCode(GlobalUtils.getThirdDepartOrgCode(loginUser.getOrgCode())).getOrgCode())
|
|
||||||
.or()
|
|
||||||
.likeRight(SysMessageNoticeScope::getScopeId,
|
|
||||||
sysCache.getDepartByOrgCode(loginUser.getOrgCode()).getOrgCode());
|
|
||||||
List<SysMessageNoticeScope> planScopes = scopeService.list(scopeWrapper);
|
List<SysMessageNoticeScope> planScopes = scopeService.list(scopeWrapper);
|
||||||
return planScopes.stream().map(SysMessageNoticeScope::getNoticeId).collect(Collectors.toList());
|
return planScopes.stream().map(SysMessageNoticeScope::getNoticeId).collect(Collectors.toList());
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user