From 27cd777ff3be2a0018949ec2d55f9431abfb1e04 Mon Sep 17 00:00:00 2001
From: CMM <2198256324@qq.com>
Date: Sun, 25 Jun 2023 10:57:26 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=A1=A3=E6=A1=88=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pmapi/filemanage/manage/ProjectFileManage.java    | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/filemanage/manage/ProjectFileManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/filemanage/manage/ProjectFileManage.java
index 05baa00..1fab0be 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/filemanage/manage/ProjectFileManage.java
+++ b/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());