MVP1.5-薪资导入优化（社保基数）

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

@@ -144,7 +144,7 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper,
 			lastBase.setApplyEndDate(DateUtil.addDayByDate(sysBaseSetInfo.getApplyStartDate(), -1));
 			this.updateById(lastBase);
 		}
-		this.saveOrUpdateBaseAndFundPro(sysBaseSetInfo);
+		this.saveOrUpdateBaseAndFundPro(sysBaseSetInfo, null);
 		return R.ok();
 	}
 
@@ -208,7 +208,7 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper,
 			return R.failed("对应户、地市、有效期的基数配置已存在！");
 		}
 
-		this.saveOrUpdateBaseAndFundPro(sysBaseSetInfo);
+		this.saveOrUpdateBaseAndFundPro(sysBaseSetInfo, old);
 		// 记录变更日志
 		tSocialLogService.saveModificationRecord(CommonConstants.ONE_INT, old.getId(), old, sysBaseSetInfo);
 		return R.ok();
@@ -221,7 +221,7 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper,
 	 * @Date: 2022/7/12 14:33
 	 * @return: void
 	 **/
-	private void saveOrUpdateBaseAndFundPro(SysBaseSetInfo sysBaseSetInfo) {
+	private void saveOrUpdateBaseAndFundPro(SysBaseSetInfo sysBaseSetInfo, SysBaseSetInfo old) {
 		if (Common.isNotNull(sysBaseSetInfo.getId())) {
 			baseMapper.updateById(sysBaseSetInfo);
 		} else {
@@ -233,6 +233,9 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper,
 			//tForecastLibraryService.updateForecastLibaryBySysBase(sysBaseSetInfo)
 		}
 		List<SysPayProportion> payProportionList = sysBaseSetInfo.getFundProList();
+		if (old != null && Common.isNotNull(old.getFundProList())) {
+			sysPayProportionService.removeBatchByIds(old.getFundProList());
+		}
 		if (Common.isNotNull(payProportionList)) {
 			for (SysPayProportion payProportion : payProportionList) {
 				if (Common.isNotNull(payProportion.getId())) {