提交重复共锁提示 去除多次日志记录

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/workdesign/WorkflowWorkHandleServiceImpl.java

@@ -320,6 +320,12 @@ public class WorkflowWorkHandleServiceImpl implements WorkflowWorkHandleService
                 .eq(WorkflowWorkNodeUserDO::getNodeId, vo.getNodeId())
                 .eq(WorkflowWorkNodeUserDO::getUserId, adminUserDO.getId()));
         Assert.notNull(nodeUserDO, "共锁失败，您不是共锁人!");
+        // 检查是否重复共锁
+        WorkflowWorkNodeUserDO one = nodeUserService.getOne(Wrappers.<WorkflowWorkNodeUserDO>lambdaQuery()
+                .eq(WorkflowWorkNodeUserDO::getNodeId, vo.getNodeId())
+                .eq(WorkflowWorkNodeUserDO::getUserId, adminUserDO.getId())
+                .eq(WorkflowWorkNodeUserDO::getStatus, "1"));
+        Assert.notNull(one, "共锁失败，请勿重复共锁!");
         LocalDateTime now = LocalDateTime.now();
         nodeUserService.update(Wrappers.<WorkflowWorkNodeUserDO>lambdaUpdate()
                 .eq(WorkflowWorkNodeUserDO::getId, nodeUserDO.getId())
@@ -340,7 +346,8 @@ public class WorkflowWorkHandleServiceImpl implements WorkflowWorkHandleService
             workflowWorkService.updateNodeApproval(approvalNodeReqVO);
 
             // isc_workflow_work_log日志记录
-            workflowWorkLogService.createWorkflowWorkLog(vo.getNodeId(), null);
+            // updateNodeApproval方法种已经记录，防止多次记录
+            // workflowWorkLogService.createWorkflowWorkLog(vo.getNodeId(), null);
         }
         return true;
     }
@@ -496,7 +503,7 @@ public class WorkflowWorkHandleServiceImpl implements WorkflowWorkHandleService
                                 .set(WorkflowWorkTicketKeyDO::getToHardwareCode, keyBackVO.getHardwareCode())
                                 .set(WorkflowWorkTicketKeyDO::getGiveBackTime, now));
                         // isc_workflow_work_log日志记录
-                        workflowWorkLogService.createWorkflowWorkLog(nodeId, "1");
+                        // workflowWorkLogService.createWorkflowWorkLog(nodeId, "1");
                     }
                 }
             }
@@ -557,7 +564,8 @@ public class WorkflowWorkHandleServiceImpl implements WorkflowWorkHandleService
         workflowWorkService.updateNodeApproval(approvalNodeReqVO);
 
         // isc_workflow_work_log日志记录
-        workflowWorkLogService.createWorkflowWorkLog(nodeId, null);
+        // updateNodeApproval方法种已经记录，防止多次记录
+        // workflowWorkLogService.createWorkflowWorkLog(nodeId, null);
 
         return true;
     }