|
|
@@ -110,7 +110,7 @@ public class SysDictController {
|
|
|
|
|
|
Integer deptId = SecurityUtils.getUser().getDeptId();
|
|
|
if ("subject_location".equals(type) && 1 != deptId) {
|
|
|
- List<SysDeptSub> l = deptSubService.list(Wrappers.<SysDeptSub>lambdaQuery().eq(SysDeptSub::getDeptId, deptId));
|
|
|
+ List<SysDeptSub> l = deptSubService.list(Wrappers.<SysDeptSub>lambdaQuery().eq(SysDeptSub::getDeptId, deptId).eq(SysDeptSub::getEnableFlag, "1"));
|
|
|
if (CollUtil.isNotEmpty(l)) {
|
|
|
List<String> collect = l.stream().filter(sub -> sub.getSubjectLocation() != null).map(sub -> sub.getSubjectLocation().getType()).collect(Collectors.toList());
|
|
|
if (CollUtil.isNotEmpty(collect)) {
|
