Merge remote-tracking branch 'origin/master'

pmapi/src/main/java/com/ningdatech/pmapi/filemanage/manage/ProjectFileManage.java

@@ -167,14 +167,17 @@ public class ProjectFileManage {
                 historyService.createHistoricProcessInstanceQuery().processInstanceId(instCode).singleResult();
             ProjectInst projectInst = projectInstService
                 .getOne(Wrappers.lambdaQuery(ProjectInst.class).eq(ProjectInst::getInstCode, instCode));
-            Integer instType = projectInst.getInstType();
-            // 从申请借阅信息表中查询当前项目是否有当前登录用户发起的申请借阅审批流程
-            ProjectApplyBorrow applyBorrow = projectApplyBorrowService.getOne(Wrappers
-                .lambdaQuery(ProjectApplyBorrow.class).eq(ProjectApplyBorrow::getApplyBorrowEmployeeCode, employeeCode)
-                .eq(ProjectApplyBorrow::getProjectId, p.getId()).eq(ProjectApplyBorrow::getInstanceId, instCode));
-            if (Objects.nonNull(applyBorrow) && InstTypeEnum.APPLY_BORROW.getCode().equals(instType)
-                && !HisProInsEndActId.END.equals(newInstance.getEndActivityId())) {
-                vo.setCanApplyBorrow(Boolean.FALSE);
+            // 推送省局联审的项目流程实例为EMPTY
+            if (Objects.nonNull(projectInst)) {
+                Integer instType = projectInst.getInstType();
+                // 从申请借阅信息表中查询当前项目是否有当前登录用户发起的申请借阅审批流程
+                ProjectApplyBorrow applyBorrow = projectApplyBorrowService.getOne(Wrappers
+                        .lambdaQuery(ProjectApplyBorrow.class).eq(ProjectApplyBorrow::getApplyBorrowEmployeeCode, employeeCode)
+                        .eq(ProjectApplyBorrow::getProjectId, p.getId()).eq(ProjectApplyBorrow::getInstanceId, instCode));
+                if (Objects.nonNull(applyBorrow) && InstTypeEnum.APPLY_BORROW.getCode().equals(instType)
+                        && !HisProInsEndActId.END.equals(newInstance.getEndActivityId())) {
+                    vo.setCanApplyBorrow(Boolean.FALSE);
+                }
             }
             return vo;
         }).collect(Collectors.toList());