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() .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)) {//如果调查通过