From 88176bfde0f1a2c9a357af197e54bf0bc252c70e Mon Sep 17 00:00:00 2001
From: shijie <648688341@qq.com>
Date: Fri, 16 Apr 2021 14:17:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84=E8=B0=83?=
 =?UTF-8?q?=E6=9F=A5=E9=A9=B3=E5=9B=9E=E5=88=B0AB=E8=A7=92=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DgGuaranteeAssignUserServiceImpl.java      | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeAssignUserServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeAssignUserServiceImpl.java
index e53ec9f9..dd31aafa 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeAssignUserServiceImpl.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeAssignUserServiceImpl.java
@@ -456,8 +456,10 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
             DgLoanCommitteeConsider consider = dgLoanCommitteeConsiderMapper.selectOne(new QueryWrapper<DgLoanCommitteeConsider>()
                     .eq("business_id", guaranteeAssignUser.getBusinessId()).eq("role_id", PromptSuccess.DSH_ID));
 
-            if (investigation != null && investigation.getAuditStatus().equals(StatusCode.SP_REJECT) && investigation.getOperationStatus().equals(StatusCode.CZ_PROCESSED)
-                    && guaranteeAssignUser.getStatus().equals(StatusCode.SP_REJECT)) {//合规调查驳回情况处理
+            if ((investigation != null && investigation.getAuditStatus().equals(StatusCode.SP_IN_REVIEW) && investigation.getOperationStatus().equals(StatusCode.CZ_PROCESSED)
+                    && guaranteeAssignUser.getStatus().equals(StatusCode.SP_IN_REVIEW)) || (investigation != null && investigation.getAuditStatus().equals(StatusCode.SP_REJECT)
+                    && investigation.getOperationStatus().equals(StatusCode.CZ_PROCESSED)
+                            && guaranteeAssignUser.getStatus().equals(StatusCode.SP_REJECT))) {//合规调查驳回情况处理
 
                 //调查通过，修改法规经理操作状态为待处理，其他子业务为审核中
                 if (investigateGuaranteeRequest.getStatus().equals(StatusCode.SP_IN_REVIEW)) {//如果调查通过