Merge remote-tracking branch 'origin/master'

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeLetterAssignUserController.java

@@ -77,7 +77,7 @@ public class DgGuaranteeLetterAssignUserController {
             @ApiParam(name = "guaranteeLetterUpdateStatusRequest", value = "更新确认状态请求", required = true)
             @RequestBody GuaranteeLetterUpdateStatusRequest guaranteeLetterUpdateStatusRequest) {
         //如果为驳回操作且无审核意见，抛出异常
-        if (StatusCode.SP_REJECT.equals(guaranteeLetterUpdateStatusRequest.getStatus()) && guaranteeLetterUpdateStatusRequest.getAuditOpinion().length()==0){
+        if (StatusCode.SP_REJECT.equals(guaranteeLetterUpdateStatusRequest.getStatus()) && guaranteeLetterUpdateStatusRequest.getAuditOpinion()==null || guaranteeLetterUpdateStatusRequest.getAuditOpinion().length()==0){
             return ResponseResult.FAIL(44444,"请填写审核意见！");
         }
         boolean result = guaranteeLetterAssignUserService.updateGuaranteeLetterStatus(guaranteeLetterUpdateStatusRequest);

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLoanNoticeController.java

@@ -71,7 +71,7 @@ public class DgLoanNoticeController {
             @ApiParam(name = "loanNoticeUpdateRequest", value = "更新放款通知请求", required = true)
             @RequestBody LoanNoticeUpdateRequest loanNoticeUpdateRequest) {
         //如果为驳回操作且无审核意见，抛出异常
-        if (StatusCode.SP_REJECT.equals(loanNoticeUpdateRequest.getStatus()) && loanNoticeUpdateRequest.getAuditOpinion().length()==0){
+        if (StatusCode.SP_REJECT.equals(loanNoticeUpdateRequest.getStatus()) && loanNoticeUpdateRequest.getAuditOpinion()==null || loanNoticeUpdateRequest.getAuditOpinion().length()==0){
             return ResponseResult.FAIL(44444,"请填写审核意见！");
         }
         boolean result = loanNoticeService.updateLoanNotice(loanNoticeUpdateRequest);

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgPaymentConfirmationConsiderController.java

@@ -62,7 +62,7 @@ public class DgPaymentConfirmationConsiderController {
             @ApiParam(name = "paymentConfirmationUpdateRequest", value = "更新回款确认请求", required = true)
             @RequestBody PaymentConfirmationUpdateRequest paymentConfirmationUpdateRequest) {
         //如果为驳回操作且无审核意见，抛出异常
-        if (StatusCode.SP_REJECT.equals(paymentConfirmationUpdateRequest.getStatus()) && paymentConfirmationUpdateRequest.getAuditOpinion().length()==0){
+        if (StatusCode.SP_REJECT.equals(paymentConfirmationUpdateRequest.getStatus()) && paymentConfirmationUpdateRequest.getAuditOpinion()==null || paymentConfirmationUpdateRequest.getAuditOpinion().length()==0){
             return ResponseResult.FAIL(44444,"请填写审核意见！");
         }
         boolean result = paymentConfirmationConsiderService.updatePaymentConfirmation(paymentConfirmationUpdateRequest);