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

@@ -920,6 +920,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			param.setAuthSql(param.getAuthSql().replace("1=2 CONCAT", "CONCAT"));
 		}
 		List<InsuranceExportListVO> insuranceExportList;
+		//如果是待投保状态，sql中HANDLED_BY过滤条件不需要，这里强制变为null
+		if(param.getBuyHandleStatus() == CommonConstants.ONE_INT){
+			param.setCreateBy(null);
+		}
 		//如勾选项不为空，则导出勾选记录；否则导出当前筛选条件下 && 「待投保」的结果集
 		if (CollectionUtils.isNotEmpty(param.getIdList())){
 			insuranceExportList =  baseMapper.getInsuranceExportListBySelect(param.getIdList());
@@ -3528,6 +3532,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			param.setAuthSql(param.getAuthSql().replace("1=2 CONCAT", "CONCAT"));
 		}
 		List<RefundExportListVo> refundExportList;
+		//如果是待减员状态，sql中UPDATE_BY过滤条件不需要，这里强制变为null
+		if(param.getReduceHandleStatus() == CommonConstants.ONE_INT){
+			param.setCreateBy(null);
+		}
 		//如勾选项不为空，则导出勾选记录；否则导出当前筛选条件下 && 「待减员」的结果集
 		if (CollectionUtils.isNotEmpty(param.getIdList())){
 			refundExportList =  baseMapper.getRefundExportListBySelect(param.getIdList());