我的待办

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/LiquidTankTaskServiceImpl.java

@@ -177,10 +177,14 @@ public class LiquidTankTaskServiceImpl extends BaseServiceImpl<LiquidTankTaskMap
     @Override
     public R editDrugBat(List<LiquidTankTask> list) {
         for (LiquidTankTask task : list) {
+            LiquidTank liquidTank = liquidTankService.getById(task.getLiquidTankId());
+            if (liquidTank == null) {
+                return R.fail("槽液信息不存在");
+            }
 //            task = basicChangeStatus(task.getId(), LiquidTankTaskConst.S_PENDING_REVIEW);
             task = basicChangeTaskStatus(task, LiquidTankTaskConst.S_PENDING_REVIEW);
             basicUpdateById(task);
-            mesApprovalRecordService.createApproval(task.getId(), MesApprovalRecordBizTypeEnum.LIQUID_TANK_TASK.getDesc(), task.getUpdateUser(), task.getUpdateTime());
+            mesApprovalRecordService.createApprovalWithUsers(task.getId(), MesApprovalRecordBizTypeEnum.LIQUID_TANK_TASK.getDesc(), task.getUpdateUser(), task.getUpdateTime(), Arrays.asList(liquidTank.getProcessUserId()));
         }
         return R.success();
     }
@@ -207,6 +211,13 @@ public class LiquidTankTaskServiceImpl extends BaseServiceImpl<LiquidTankTaskMap
                 zeroUpdate(task, reviewPass, reviewOpinion);
                 continue;
             }
+            LiquidTank liquidTank = liquidTankService.getById(task.getLiquidTankId());
+            if (liquidTank == null) {
+                return R.fail("槽液信息不存在");
+            }
+            if(!AuthUtil.getUser().getUserId().equals(liquidTank.getProcessUserId())){
+                return R.fail(task.getName() + ",您没有审批权限");
+            }
             if (Objects.equals(reviewPass, LiquidTankTaskConst.REVIEW_YES)) {
                 // 审核通过
                 task = basicChangeStatus(task.getId(), LiquidTankTaskConst.S_PENDING_SEND_DRUG);

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateServiceImpl.java

@@ -432,8 +432,8 @@ public class ProReTemplateServiceImpl extends EnBaseServiceImpl<ProReTemplateMap
      * 检查一级审核权限
      */
     private boolean hasAuditRoleLevel1() {
-        // 工艺组长/工艺室主任
+        // 热表-标准化工艺师（工艺组长）
-        return RoleUtil.hasAnyRole("process_manager", "热表-工艺组长");
+        return RoleUtil.hasAnyRole("standard_process_engineer");
     }
 
     /**