|
@@ -429,14 +429,14 @@ public class WmSupervisionManager {
|
|
|
|
|
|
List<Integer> supTaskIds;
|
|
List<Integer> supTaskIds;
|
|
// 负责人
|
|
// 负责人
|
|
- if (CollUtil.containsAny(roles, List.of(51, 54, 55, 61))) {
|
|
|
|
|
|
+ if (CollUtil.containsAny(roles, List.of(57, 58, 59, 60))) {
|
|
|
|
|
|
Set<Integer> temp = CollUtil.unionDistinct(ckt1, rejected);
|
|
Set<Integer> temp = CollUtil.unionDistinct(ckt1, rejected);
|
|
supTaskIds = CollUtil.subtractToList(init, temp);
|
|
supTaskIds = CollUtil.subtractToList(init, temp);
|
|
|
|
|
|
}
|
|
}
|
|
// 分管领导
|
|
// 分管领导
|
|
- else if (CollUtil.containsAny(roles, List.of(57, 58, 59, 60))) {
|
|
|
|
|
|
+ else if (CollUtil.containsAny(roles, List.of(51, 54, 55, 61))) {
|
|
Set<Integer> temp = CollUtil.unionDistinct(ckt2, rejected);
|
|
Set<Integer> temp = CollUtil.unionDistinct(ckt2, rejected);
|
|
supTaskIds = CollUtil.subtractToList(ckt1, temp);
|
|
supTaskIds = CollUtil.subtractToList(ckt1, temp);
|
|
|
|
|
|
@@ -450,7 +450,6 @@ public class WmSupervisionManager {
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
-
|
|
|
|
if (CollUtil.isEmpty(supTaskIds)) {
|
|
if (CollUtil.isEmpty(supTaskIds)) {
|
|
return Collections.emptyList();
|
|
return Collections.emptyList();
|
|
}
|
|
}
|