Merge remote-tracking branch 'origin/develop' into develop

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java

@@ -1553,8 +1553,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 								}
 								//如果当前实缴信息已推送，且金额与本次不一致，则推送实缴更新
 								BigDecimal bigDecimal = new BigDecimal(success.getActualPremium());
-								boolean b = bigDecimal.compareTo(detail.getActualPremium()) == CommonConstants.ZERO_INT;
-								if(CommonConstants.ONE_INT == isActualPush && !b){
+								boolean c = !Common.isNotNull(detail.getActualPremium()) ||
+										bigDecimal.compareTo(detail.getActualPremium()) != 0;
+								if(CommonConstants.ONE_INT == isActualPush && c){
 									//推送保费更新
 									settle.setActualPremium(bigDecimal);
 									settle.setIsActualPush(CommonConstants.ZERO_INT);
@@ -1592,7 +1593,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 					//如果当前保单为单独结算
 					if(settleType == CommonConstants.ONE_INT){
 						//推送过实缴信息且金额与本次不一致，则推送更新
-						if(StringUtils.isNotBlank(defaultSettleId) && (new BigDecimal(success.getActualPremium()).compareTo(detail.getActualPremium()) != 0)){
+						boolean c = !Common.isNotNull(detail.getActualPremium()) ||
+								new BigDecimal(success.getActualPremium()).compareTo(detail.getActualPremium()) != 0;
+						if(StringUtils.isNotBlank(defaultSettleId) && c){
 							//推送保费更新
 							TInsuranceSettle settle = tInsuranceSettleService.getById(detail.getDefaultSettleId());
 							settle.setActualPremium(new BigDecimal(success.getActualPremium()));
@@ -1641,8 +1644,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				String policyNo = success.getPolicyNo();
 				boolean booleanInvoiceNo = StringUtils.isNotBlank(invoiceNo) && !invoiceNo.equals(detail.getInvoiceNo());
 				boolean booleanPolicyNo = StringUtils.isNotBlank(policyNo) && !policyNo.equals(detail.getPolicyNo());
+				boolean isEquals = Common.isNotNull(detail.getActualPremium()) && new BigDecimal(success.getActualPremium()).compareTo(detail.getActualPremium()) == 0;
 				//如果当前保费为空，且保单号或发票号不一样
-				if((StringUtils.isBlank(success.getActualPremium()) || new BigDecimal(success.getActualPremium()).compareTo(detail.getActualPremium()) == 0) && (booleanInvoiceNo || booleanPolicyNo)){
+				if((StringUtils.isBlank(success.getActualPremium()) || isEquals) && (booleanInvoiceNo || booleanPolicyNo)){
 					if(StringUtils.isNotBlank(detail.getDefaultSettleId())){
 						TInsuranceSettle settle = tInsuranceSettleService.getById(detail.getDefaultSettleId());
 						if(Optional.ofNullable(settle).isPresent()){

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialfundHouseResServiceImpl.java

@@ -62,7 +62,6 @@ public class TSocialfundHouseResServiceImpl extends ServiceImpl<TSocialfundHouse
 	@Override
 	public R saveSocialAuth(TSocialfundHouseRes searchVo) {
 		LambdaQueryWrapper<TSocialfundHouseRes> wrapper = new LambdaQueryWrapper<>();
-		wrapper.eq(TSocialfundHouseRes::getStatus, CommonConstants.ZERO_STRING);
 		if (Common.isNotNull(searchVo.getSocialHousehold())) {
 			wrapper.eq(TSocialfundHouseRes::getSocialHousehold, searchVo.getSocialHousehold());
 		}
@@ -79,9 +78,9 @@ public class TSocialfundHouseResServiceImpl extends ServiceImpl<TSocialfundHouse
 		if (Common.isNotNull(socialfundHouseRes)) {
 			String errorMessage;
 			if (CommonConstants.ZERO_STRING.equals(searchVo.getAuthType())) {
-				errorMessage = "员工已存在审核权限";
+				errorMessage = "请勿重复添加审核人员";
 			} else {
-				errorMessage = "员工已存在办理权限";
+				errorMessage = "请勿重复添加办理人员";
 			}
 			return R.failed(errorMessage);
 		} else {