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

yifu-archives/yifu-archives-biz/src/main/resources/mapper/TSettleDomainMapper.xml

@@ -270,6 +270,7 @@
 		a.BPO_FLAG
 		FROM t_settle_domain a
 		where 1=1
+			and a.DELETE_FLAG = '0'
 			<if test="codes != null and codes.size() > 0">
 				and  a.DEPART_NO in
 				<foreach collection="codes" item="param" index="index" open="(" close=")" separator=",">

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

@@ -895,7 +895,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		}
 		param.setCreateBy(user.getId());
 		menuUtil.setAuthSql(user, param);
-		List<InsuranceExportListVO> insuranceExportList = new ArrayList<>();
+		List<InsuranceExportListVO> insuranceExportList;
 		//如勾选项不为空，则导出勾选记录；否则导出当前筛选条件下 && 「待投保」的结果集
 		if (CollectionUtils.isNotEmpty(param.getIdList())){
 			insuranceExportList =  baseMapper.getInsuranceExportListBySelect(param.getIdList());