兼容无共锁人日志生成多余问题

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

@@ -253,6 +253,7 @@ public class WorkflowWorkHandleServiceImpl implements WorkflowWorkHandleService
                     List<WorkflowWorkPointDO> unclockPoints = pointService.list(Wrappers.<WorkflowWorkPointDO>lambdaQuery()
                             .eq(WorkflowWorkPointDO::getNodeId, nodeId)
                             .eq(WorkflowWorkPointDO::getStatus, "0"));
+                    List<WorkflowWorkNodeUserDO> list2 = new ArrayList<>();
                     if (unclockPoints.isEmpty()) {
                         // 说明全部点位上锁完成，可以更新上锁人状态
                         nodeUserService.update(Wrappers.<WorkflowWorkNodeUserDO>lambdaUpdate()
@@ -269,7 +270,7 @@ public class WorkflowWorkHandleServiceImpl implements WorkflowWorkHandleService
 
 
                         // 检测有没有共锁人共锁操作，没有直接跳过
-                        List<WorkflowWorkNodeUserDO> list2 = nodeUserService.list(Wrappers.<WorkflowWorkNodeUserDO>lambdaQuery()
+                        list2 = nodeUserService.list(Wrappers.<WorkflowWorkNodeUserDO>lambdaQuery()
                                 .eq(WorkflowWorkNodeUserDO::getNodeId, nodeId)
                                 .eq(WorkflowWorkNodeUserDO::getType, "jtcolocker")
                                 .ne(WorkflowWorkNodeUserDO::getStatus, "1"));
@@ -299,8 +300,12 @@ public class WorkflowWorkHandleServiceImpl implements WorkflowWorkHandleService
                                 .set(WorkflowWorkTicketKeyDO::getToHardwareCode, keyBackVO.getHardwareCode())
                                 .set(WorkflowWorkTicketKeyDO::getGiveBackTime, now));
 
-                        // isc_workflow_work_log日志记录
-                        workflowWorkLogService.createWorkflowWorkLog(nodeDO.getId(), "2");
+                        if (!list2.isEmpty()) {
+                            // 如果list2是空的则在updateNodeApproval中被记录
+                            // isc_workflow_work_log日志记录
+                            workflowWorkLogService.createWorkflowWorkLog(nodeDO.getId(), "2");
+                        }
+
                     }
                 }
             }