流程项目信息

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java

@@ -27,7 +27,9 @@ import com.ruoyi.flowable.flow.FlowableUtils;
 import com.ruoyi.flowable.service.IFlowTaskService;
 import com.ruoyi.flowable.service.ISysDeployFormService;
 import com.ruoyi.flowable.service.ISysFormService;
+import com.ruoyi.oa.domain.CmcContract;
 import com.ruoyi.oa.domain.CmcProject;
+import com.ruoyi.oa.domain.CmcSubContract;
 import com.ruoyi.oa.service.*;
 import com.ruoyi.system.domain.FlowProcDefDto;
 import com.ruoyi.system.domain.FlowVarInst;
@@ -949,14 +951,24 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
         return AjaxResult.success(page);
     }
 
+    /**
+     * 流程项目合同信息
+     *
+     */
     private void setFlowProjectInfo(List<FlowTaskDto> hisTaskList, FlowTaskDto flowTask) {
         if (flowTask.getProcDefName().contains("合同评审")) {
             flowTask.setContractId(flowTask.getProcInsId());
             if (flowTask.getContractId() != null) {
-                if (flowTask.getProcDefName().contains("承接"))
-                    flowTask.setContractName(cmcContractService.selectCmcContractByContractId(flowTask.getContractId()).getContractName());
-                if (flowTask.getProcDefName().contains("分包"))
-                    flowTask.setContractName(cmcSubContractService.selectCmcSubContractBySubContractId(flowTask.getContractId()).getSubContractName());
+                if (flowTask.getProcDefName().contains("承接")) {
+                    CmcContract cmcContract = cmcContractService.selectCmcContractByContractId(flowTask.getContractId());
+                    if (cmcContract != null)
+                        flowTask.setContractName(cmcContractService.selectCmcContractByContractId(flowTask.getContractId()).getContractName());
+                }
+                if (flowTask.getProcDefName().contains("分包")) {
+                    CmcSubContract cmcSubContract = cmcSubContractService.selectCmcSubContractBySubContractId(flowTask.getContractId());
+                    if (cmcSubContract != null)
+                        flowTask.setContractName(cmcSubContractService.selectCmcSubContractBySubContractId(flowTask.getContractId()).getSubContractName());
+                }
             }
         }
         else {
@@ -1589,8 +1601,6 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
     /**
      * 流程项目id
      *
-     * @param flowTaskDto
-     * @return
      */
     private String getFlowProjectId(FlowTaskDto flowTaskDto) {
         String projectId = "";