fix: 80183 法规采购流程--发起节点发起后被驳回--修改标准和更换人员--点击保存--不起作用

laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java

@@ -309,7 +309,6 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
         ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
         String processDefinitionId = processInstance.getProcessDefinitionId();
         Map<String, Object> userMap = new HashMap<>();
-//        boolean batchDelFlag = StrUtil.isNotBlank(annualInitData.getBatchRejectIds());
         switch (taskName) {
             case STANDARD_ENGINEER_INIT:
 

laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbStandardPurchaseController.java

@@ -2,7 +2,10 @@ package com.jero.modules.activiti.process.fb.controller;
 
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.modules.activiti.enums.ProcessTypeEnum;
+import com.jero.modules.activiti.process.common.entity.ProcessDraft;
 import com.jero.modules.activiti.process.common.entity.TransferVO;
+import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
 import com.jero.modules.activiti.process.fb.entity.ProcessFbStandardPurchase;
 import com.jero.modules.activiti.process.fb.service.IProcessFbStandardPurchaseService;
 import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO;
@@ -18,6 +21,7 @@ import org.springframework.web.bind.annotation.*;
 import io.swagger.annotations.Api;
 import org.springframework.web.servlet.ModelAndView;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 
@@ -32,9 +36,13 @@ import java.util.List;
 @RequestMapping("/process/fb/processFbStandardPurchase")
 @Slf4j
 public class ProcessFbStandardPurchaseController extends JeroController<ProcessFbStandardPurchase, IProcessFbStandardPurchaseService> {
-    @Autowired
+
+    @Resource
     private IProcessFbStandardPurchaseService processFbStandardPurchaseService;
 
+    @Resource
+    private ActFlowCommonService actFlowCommonService;
+
     @GetMapping("/queryProcessInfoVO")
     @AutoLog(value = "法规采购流程表-查询流程信息")
     @ApiImplicitParams({
@@ -43,7 +51,11 @@ public class ProcessFbStandardPurchaseController extends JeroController<ProcessF
             @ApiImplicitParam(name = "taskId", value = "任务id")
     })
     @ApiOperation("法规采购流程表-查询流程信息")
-    public Result<ProcessInfoVO<List<ProcessFbStandardPurchase>>> queryProcessInfoVO(String draftId, String processInstanceId, String taskId, String projectId) {
+    public Result<?> queryProcessInfoVO(String draftId, String processInstanceId, String taskId, String projectId) {
+        ProcessDraft draft = actFlowCommonService.getExistDraftByTaskId(taskId, ProcessTypeEnum.FB_STANDARD_PURCHASE);
+        if (draft != null) {
+            return Result.OK(draft);
+        }
         ProcessInfoVO<List<ProcessFbStandardPurchase>> processInfoVO = processFbStandardPurchaseService.queryProcessInfoVO(draftId, processInstanceId, taskId, projectId);
         return Result.OK(processInfoVO);
     }