优化

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/THaveSalaryNosocialServiceImpl.java

@@ -185,7 +185,7 @@ public class THaveSalaryNosocialServiceImpl extends ServiceImpl<THaveSalaryNosoc
 		List<THaveSalaryNoSocialExportVo> list = new ArrayList<>();
 		// TODO
 		List<String> settleDomainIds =null;
-		List<String> ids = null;
+		List<String> ids = Common.getList(searchVo.getIds());
 		String sql = null;
 		int count = noPageCountDiy(searchVo,settleDomainIds,ids,sql);
 		ServletOutputStream out = null;

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryAccountServiceImpl.java

@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.BigDecimalUtils;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.ExcelUtil;
@@ -95,6 +96,10 @@ public class TSalaryAccountServiceImpl extends ServiceImpl<TSalaryAccountMapper,
 					if (Common.isNotNull(list)) {
 						ExcelUtil<TSalaryAccount> util = new ExcelUtil<>(TSalaryAccount.class);
 						for (TSalaryAccount vo : list) {
+							if (CommonConstants.THREE_STRING.equals(vo.getFormType())){
+								vo.setRelaySalary(vo.getRelaySalaryUnit());
+								vo.setSalaryTax(BigDecimalUtils.safeAdd(vo.getSalaryTax(),vo.getSalaryTaxUnit()));
+							}
 							util.convertEntity(vo, null, null, null);
 						}
 					}