|
|
@@ -1630,6 +1630,7 @@ public class WmSupervisionManager {
|
|
|
// .in(WmTaskSupervision::getPackageId, pkgIds)
|
|
|
.orderByDesc(WmTaskSupervision::getCreateTime));
|
|
|
|
|
|
+ // 获取当前操作人监督的记录
|
|
|
List<WmTaskSupervision> list =
|
|
|
list1.stream()
|
|
|
.filter(
|
|
|
@@ -1645,20 +1646,22 @@ public class WmSupervisionManager {
|
|
|
})
|
|
|
.collect(Collectors.toList());
|
|
|
|
|
|
- if (CollUtil.isEmpty(list)) {
|
|
|
- return page;
|
|
|
- }
|
|
|
|
|
|
- // 监督员
|
|
|
+
|
|
|
Boolean review = query.getReview();
|
|
|
|
|
|
Page<WmTask> taskPage;
|
|
|
boolean isService;
|
|
|
+ // 监督员
|
|
|
if (CollUtil.containsAny(roles, List.of(49, 52, 53, 56))) {
|
|
|
isService = false;
|
|
|
|
|
|
if (review) {
|
|
|
|
|
|
+// if (CollUtil.isEmpty(list)) {
|
|
|
+// return page;
|
|
|
+// }
|
|
|
+
|
|
|
List<String> taskIds =
|
|
|
list.stream()
|
|
|
.filter(ts -> StrUtil.equals(ts.getCreateBy(), user.getUsername()))
|
