root/wuHanXinRui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:部门查询禁用不显示问题

Browse Source
This commit is contained in:
zhangzhiqiang
2022-12-03 19:12:21 +08:00
parent 2f1a3ffb68
commit 6694a12507
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mes/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/DeptServiceImpl.java
View File

@@ -92,7 +92,11 @@ public class DeptServiceImpl implements DeptService {
}
}
}
List<DeptDto> list = deptMapper.toDto(deptRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root, criteria, criteriaBuilder), sort));
if (Boolean.FALSE.equals(criteria.getEnabled())){
criteria.setPidIsNull(null);
}
List<Dept> all = deptRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root, criteria, criteriaBuilder), sort);
List<DeptDto> list = deptMapper.toDto(all);
// 如果为空，就代表为自定义权限或者本级权限，就需要去重，不理解可以注释掉，看查询结果
if (StrUtil.isEmpty(dataScopeType)) {
return deduplication(list);