Ver código fonte

我的、待办、已办项目名称

lamphua 9 meses atrás
pai
commit
08d97b6a8c

+ 6
- 2
oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java Ver arquivo

27
 import com.ruoyi.flowable.service.IFlowTaskService;
27
 import com.ruoyi.flowable.service.IFlowTaskService;
28
 import com.ruoyi.flowable.service.ISysDeployFormService;
28
 import com.ruoyi.flowable.service.ISysDeployFormService;
29
 import com.ruoyi.flowable.service.ISysFormService;
29
 import com.ruoyi.flowable.service.ISysFormService;
30
+import com.ruoyi.oa.domain.CmcProject;
30
 import com.ruoyi.oa.service.*;
31
 import com.ruoyi.oa.service.*;
31
 import com.ruoyi.system.domain.FlowProcDefDto;
32
 import com.ruoyi.system.domain.FlowProcDefDto;
32
 import com.ruoyi.system.domain.FlowVarInst;
33
 import com.ruoyi.system.domain.FlowVarInst;
962
             flowTask.setProjectId(getFlowProjectId(flowTask));
963
             flowTask.setProjectId(getFlowProjectId(flowTask));
963
             if (flowTask.getProjectId() != null) {
964
             if (flowTask.getProjectId() != null) {
964
                 if (!flowTask.getProcDefName().equals("保证金审批")) {
965
                 if (!flowTask.getProcDefName().equals("保证金审批")) {
965
-                    flowTask.setProjectNumber(cmcProjectService.selectCmcProjectByProjectId(flowTask.getProjectId()).getProjectNumber());
966
-                    flowTask.setProjectName(cmcProjectService.selectCmcProjectByProjectId(flowTask.getProjectId()).getProjectName());
966
+                    CmcProject cmcProject = cmcProjectService.selectCmcProjectByProjectId(flowTask.getProjectId());
967
+                    if (cmcProject != null) {
968
+                        flowTask.setProjectNumber(cmcProject.getProjectNumber());
969
+                        flowTask.setProjectName(cmcProject.getProjectName());
970
+                    }
967
                 } else
971
                 } else
968
                     flowTask.setProjectName(cmcTenderService.selectCmcTenderByTenderId(flowTask.getProjectId()).getProjectName());
972
                     flowTask.setProjectName(cmcTenderService.selectCmcTenderByTenderId(flowTask.getProjectId()).getProjectName());
969
             }
973
             }

Carregando…
Cancelar
Salvar