From ee8b99a512bac9de3c88ad19b2c674c3d8c7655f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 25 六月 2025 10:29:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java
index 02352b7..c6f2cf7 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java
@@ -406,20 +406,22 @@
settleClaims.setOrigin(Constants.ONE);
if(Objects.isNull(settleClaims)
|| Objects.isNull(settleClaims.getExtData())
+ || Objects.isNull(settleClaims.getExtData().getBxName())
|| Objects.isNull(settleClaims.getExtData().getMemberName())
|| Objects.isNull(settleClaims.getExtData().getMemberIdcardType())
- || Objects.isNull(settleClaims.getExtData().getMemberIdcard())){
+ || Objects.isNull(settleClaims.getExtData().getMemberIdcard())
+ || Objects.isNull(settleClaims.getStatus())
+ ){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
- if(!Constants.equalsObject(settleClaims.getStatus(),Constants.ZERO)
- &&( Objects.isNull(settleClaims.getExtData().getBxName())
- || Objects.isNull(settleClaims.getExtData().getReportDate())
- || Objects.isNull(settleClaims.getExtData().getBxCode())
- || Objects.isNull(settleClaims.getExtData().getBxEnddate())
- || Objects.isNull(settleClaims.getExtData().getBxOrg())
- || Objects.isNull(settleClaims.getInformantPhone()) )){
- throw new BusinessException(ResponseStatus.BAD_REQUEST);
- }
+// if(!Constants.equalsObject(settleClaims.getStatus(),Constants.ZERO)
+// &&( Objects.isNull(settleClaims.getExtData().getReportDate())
+// || Objects.isNull(settleClaims.getExtData().getBxCode())
+// || Objects.isNull(settleClaims.getExtData().getBxEnddate())
+// || Objects.isNull(settleClaims.getExtData().getBxOrg())
+// || Objects.isNull(settleClaims.getInformantPhone()) )){
+// throw new BusinessException(ResponseStatus.BAD_REQUEST);
+// }
if(!Constants.equalsInteger(loginUserInfo.getType(),Constants.ZERO)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炲钩鍙扮鐞嗗憳鏃犳硶杩涜璇ユ搷浣�");
}
--
Gitblit v1.9.3