From 128e967421ce351644b3913ca9be5c0d909609c6 Mon Sep 17 00:00:00 2001 From: nidapeng <jp@doumee.com> Date: 星期五, 29 三月 2024 16:18:35 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1 --- server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java index 9cc0e6a..795e597 100644 --- a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java +++ b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java @@ -1623,6 +1623,9 @@ } public List<Integer> getCollectStatus(Integer collectStatus){ + if(collectStatus ==null){ + return new ArrayList<>(); + } List<Integer> statusList = Constants.InsuranceApplyStatus.getKesByStatus(collectStatus); if(collectStatus.equals(Constants.ApplyCollectStatus.DCD)){ statusList.addAll(Constants.InsuranceApplyStatus.getKesByStatus(Constants.ApplyCollectStatus.WTBDCD.getKey())); @@ -2184,9 +2187,9 @@ ){ throw new BusinessException(ResponseStatus.BAD_REQUEST); } - - smsEmailService.validateCode(smsCheckDTO.getCode()); - + if(!debugModel){ + smsEmailService.validateCode(smsCheckDTO.getCode()); + } MPJLambdaWrapper wrapper= new MPJLambdaWrapper<InsuranceApply>() .selectAll(InsuranceApply.class) .selectAs(Solutions::getSignKeyword,InsuranceApply::getSignKeyword) @@ -2282,7 +2285,9 @@ throw new BusinessException(ResponseStatus.BAD_REQUEST); } //楠岃瘉 楠岃瘉鐮� - smsEmailService.validateCode(smsCheckDTO.getCode()); + if(!debugModel){ + smsEmailService.validateCode(smsCheckDTO.getCode()); + } InsuranceApply model = this.queryApplyDetail(smsCheckDTO.getBusinessId()); if(Objects.isNull(model)){ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇繚鍗曚俊鎭�"); @@ -2343,7 +2348,9 @@ throw new BusinessException(ResponseStatus.BAD_REQUEST); } //楠岃瘉 楠岃瘉鐮� - smsEmailService.validateCode(smsCheckDTO.getCode()); + if(!debugModel){ + smsEmailService.validateCode(smsCheckDTO.getCode()); + } MPJLambdaWrapper wrapper= new MPJLambdaWrapper<InsuranceApply>() .selectAll(InsuranceApply.class) .selectAs(Solutions::getSignKeyword,InsuranceApply::getSignKeyword) -- Gitblit v1.9.3