|
@@ -409,8 +409,29 @@ public class WmSupervisionManager {
|
|
|
return maps;
|
|
|
} else {
|
|
|
|
|
|
+ UpmsState.TaskSupervisionState state;
|
|
|
+
|
|
|
+ // 负责人
|
|
|
+ if (CollUtil.containsAny(roles, List.of(51, 54, 55, 61))) {
|
|
|
+ state = UpmsState.TaskSupervisionState.INIT;
|
|
|
+ }
|
|
|
+ // 分管领导
|
|
|
+ else if (CollUtil.containsAny(roles, List.of(57, 58, 59, 60))) {
|
|
|
+ state = UpmsState.TaskSupervisionState.CKT1;
|
|
|
+ }
|
|
|
+ // 事业部总经理
|
|
|
+ else if (CollUtil.containsAny(roles, List.of(39))) {
|
|
|
+ state = UpmsState.TaskSupervisionState.CKT2;
|
|
|
+ } else {
|
|
|
+ throw new BizException("无监察权限");
|
|
|
+ }
|
|
|
+
|
|
|
// 获取当前积分包已经监察过的任务ID
|
|
|
- List<WmTaskSupervision> list = taskSupervisionService.list(Wrappers.<WmTaskSupervision>lambdaQuery().eq(WmTaskSupervision::getPackageId, pkgId).orderByDesc(WmTaskSupervision::getCreateTime));
|
|
|
+ List<WmTaskSupervision> list = taskSupervisionService.
|
|
|
+ list(Wrappers.<WmTaskSupervision>lambdaQuery()
|
|
|
+ .eq(WmTaskSupervision::getSupervisionState, state)
|
|
|
+ .eq(WmTaskSupervision::getPackageId, pkgId)
|
|
|
+ .orderByDesc(WmTaskSupervision::getCreateTime));
|
|
|
|
|
|
if (CollUtil.isEmpty(list)) {
|
|
|
return Collections.emptyList();
|