Преглед на файлове

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

lamphua преди 9 месеца
родител
ревизия
08d97b6a8c
променени са 1 файла, в които са добавени 6 реда и са изтрити 2 реда
  1. 6
    2
      oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java

+ 6
- 2
oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java Целия файл

@@ -27,6 +27,7 @@ import com.ruoyi.flowable.flow.FlowableUtils;
27 27
 import com.ruoyi.flowable.service.IFlowTaskService;
28 28
 import com.ruoyi.flowable.service.ISysDeployFormService;
29 29
 import com.ruoyi.flowable.service.ISysFormService;
30
+import com.ruoyi.oa.domain.CmcProject;
30 31
 import com.ruoyi.oa.service.*;
31 32
 import com.ruoyi.system.domain.FlowProcDefDto;
32 33
 import com.ruoyi.system.domain.FlowVarInst;
@@ -962,8 +963,11 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
962 963
             flowTask.setProjectId(getFlowProjectId(flowTask));
963 964
             if (flowTask.getProjectId() != null) {
964 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 971
                 } else
968 972
                     flowTask.setProjectName(cmcTenderService.selectCmcTenderByTenderId(flowTask.getProjectId()).getProjectName());
969 973
             }

Loading…
Отказ
Запис