Merge remote-tracking branch 'origin/master'

laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/service/impl/FeiShuDockingServiceImpl.java

@@ -267,12 +267,20 @@ public class FeiShuDockingServiceImpl implements IFeiShuDockingService {
                 if ("PENDING".equals(instanceDto.getTaskStatus())) {
                     BotApprovalMessageDto botApprovalMessageDto = buildBotApprovalMessageDto(instanceDto, approvalsInstanceVo);
                     String msgId = sendApprovalMessageByBot(botApprovalMessageDto);
+                    String taskIds = instanceDto.getTaskIds();
+                    if (taskIds.contains("_")) {
+                        taskIds = taskIds.substring(0, taskIds.indexOf("_"));
+                    }
                     // 将msgId存入审核记录表
                     LambdaUpdateWrapper<ProcessApprovalRecord> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
-                    lambdaUpdateWrapper.eq(ProcessApprovalRecord::getTaskId, instanceDto.getTaskIds()).or()
+                    lambdaUpdateWrapper.eq(ProcessApprovalRecord::getTaskId, taskIds);
-                            .eq(ProcessApprovalRecord::getTransferTaskId, instanceDto.getTaskIds());
+                    lambdaUpdateWrapper.set(ProcessApprovalRecord::getFeishuMsgId, msgId);
-                    lambdaUpdateWrapper.set(ProcessApprovalRecord::getFeishuMsgId,msgId);
                     processApprovalRecordService.update(lambdaUpdateWrapper);
+                }else {
+                    ApprovalsUpdateMessageVo approvalsUpdateMessageVo = new ApprovalsUpdateMessageVo();
+                    approvalsUpdateMessageVo.setMessage_id(feishuMsgId);
+                    approvalsUpdateMessageVo.setStatus(taskStatus);
+                    updateBotMessage(approvalsUpdateMessageVo);
                 }
             }else {
                 // 如果该条审核记录有飞书id ,说明是同步已办,进行审核消息状态的更新

laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/SendFeiShuServiceImpl.java

@@ -158,10 +158,12 @@ public class SendFeiShuServiceImpl implements ISendFeiShuService {
             }
             instanceDto.setInstanceStatus(instanceStatus);
             instanceDto.setTaskStatus(status);
+            String taskIdToUse = StringUtils.isNotBlank(transferTaskId) ? transferTaskId : taskId;
+            String taskIdToUseProcessed = StringUtils.contains(taskIdToUse, "_") ? taskIdToUse.substring(0, taskIdToUse.indexOf("_")) : taskIdToUse;
             String url = promoterPcLink
                     .replace("{projectId}",projectId)
                     .replace("{taskName}",processApprovalRecord.getTaskName())
-                    .replace("{taskId}", StringUtils.isBlank(transferTaskId) ? taskId : transferTaskId)
+                    .replace("{taskId}", taskIdToUseProcessed)  // 使用处理后的 taskId
                     .replace("{processInstanceId}",processApprovalRecord.getProcessInstanceId())
                     .replace("{nodeId}",processApprovalRecord.getNodeId());
             // 跳转链接
@@ -171,7 +173,7 @@ public class SendFeiShuServiceImpl implements ISendFeiShuService {
             String appUrl = reviewPcLink
                     .replace("{projectId}",projectId)
                     .replace("{taskName}",processApprovalRecord.getTaskName())
-                    .replace("{taskId}", StringUtils.isBlank(transferTaskId) ? taskId : transferTaskId)
+                    .replace("{taskId}", taskIdToUseProcessed)  // 使用处理后的 taskId
                     .replace("{processInstanceId}",processApprovalRecord.getProcessInstanceId())
                     .replace("{nodeId}",processApprovalRecord.getNodeId());
             String appBusinessLink = appUrl.replace("{url}", Objects.requireNonNull(ProcessTypeEnum.getFontReturnUrlPc(processAll.getPrcType())));

laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java

@@ -211,9 +211,16 @@ public class ProcessHandleServiceImpl implements IProcessHandleService {
         taskService.setAssignee(taskId, toUserId);
 
         String userId = processApprovalRecord.getUserId();
-        processApprovalRecord.setTransferBy(CurrentUserUtil.getId()); // 转办人
+//        processApprovalRecord.setTransferBy(CurrentUserUtil.getId()); // 转办人
-        processApprovalRecord.setUserId(toUserId); // 任务处理人
+//        processApprovalRecord.setUserId(toUserId); // 任务处理人
-        processApprovalRecordService.updateById(processApprovalRecord);
+//        processApprovalRecordService.updateById(processApprovalRecord);
+
+        // 构建更新 wrapper
+        LambdaUpdateWrapper<ProcessApprovalRecord> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.eq(ProcessApprovalRecord::getId, processApprovalRecord.getId());
+        updateWrapper.set(ProcessApprovalRecord::getTransferBy, CurrentUserUtil.getId());
+        updateWrapper.set(ProcessApprovalRecord::getUserId, toUserId);
+        processApprovalRecordService.update(updateWrapper);
         WorkCenterService classByValue = null;
         try {
             Object o = Class.forName(ProcessTypeEnum.getClassByValue(prcType)).newInstance();