fix(法规采购流程): 保存问题修复

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

@@ -54,7 +54,7 @@ public class ProcessFbStandardPurchaseServiceImpl extends ServiceImpl<ProcessFbS
         ProcessInfoVO processInfoVO = processHandleService.queryProcessInfoVO(draftId, processInstanceId, taskId, projectId);
 
         LambdaQueryWrapper<ProcessFbStandardPurchase> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(ProcessFbStandardPurchase::getBusinessId, processInfoVO.getBusinessId());
+        queryWrapper.eq(ProcessFbStandardPurchase::getBusinessId, projectId);
         queryWrapper.orderByAsc(ProcessFbStandardPurchase::getSort);
         List<ProcessFbStandardPurchase> purchaseList = list(queryWrapper);
         processInfoVO.setBusinessInfoDTO(purchaseList);

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

@@ -102,7 +102,7 @@ public class ProcessHandleServiceImpl implements IProcessHandleService{
 
         // 更新审批记录
         basicTaskInfoDTO.setTaskId(taskId);
-        basicTaskInfoDTO.setCommitFlag(CommitFlagEnum.PASS.getValue()); // 审批意见(1通过，2驳回)
+//        basicTaskInfoDTO.setCommitFlag(CommitFlagEnum.PASS.getValue()); // 审批意见(1通过，2驳回)
         updateApprovalRecord(processInfoVO);
 
         Execution execution = runtimeService.createExecutionQuery().executionId(task.getExecutionId()).singleResult();
@@ -345,6 +345,12 @@ public class ProcessHandleServiceImpl implements IProcessHandleService{
             handleFile = basicTaskInfoDTO.getHandleFile();
         }
 
+        // 保存
+        updateProcessAll(processInfoVO);
+        updateApprovalRecord(processInfoVO);
+
+        // 删除自己的草稿
+        deleteMyDraft(taskId, processInfoVO.getBusinessId(), basicProcessInfoDTO.getProcessType());
         // 非发起节点不保存到草稿
         BasicTaskInfoDTO basicTaskInfoDTO1 = processInfoVO.getBasicTaskInfoDTO();
         if (StringUtils.isBlank(basicTaskInfoDTO1.getTaskId()) || SAVE_BY_DRAFT.equals(processInfoVO.getSaveSource())){