Browse Source

two more error msg

dengjia 2 months ago
parent
commit
943f328e20

+ 9 - 3
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/manager/WmSupervisionManager.java

@@ -1979,9 +1979,15 @@ private Page<WmTask> getReviewTaskPage(WmSupervisionDto.OnTaskSupervisionPage qu
             supervision.getSupervisionId(), supervision.getRemarks(), modifiable, supervision.getSupervisionResult(), operator);
       
       } else { // 监督员
-        if (!StrUtil.equals(operator.getUsername(), supervision.getCreateBy()) || !supervision.getModifiable()) {
-            // 独占且只写一次
-            return false;
+        if (!StrUtil.equals(operator.getUsername(), supervision.getCreateBy())) {
+            // 独占
+            log.warn("该任务已存在其他账号监督记录,请刷新页面: " + supervision.getSupervisionId().toString());
+            throw new BizException("该任务已存在其他账号监督记录,请刷新页面");
+        }
+        if (!supervision.getModifiable()) {
+            // 只写一次
+            log.warn("此任务已被监督: " + supervision.getSupervisionId().toString());
+            throw new BizException("此任务已被监督");
         }
         // 监察员重新提交,删除历史的审核意见
         taskSupervisionAdviceService.delAdvice(supervision.getSupervisionId(), operator);