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

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

@@ -1608,14 +1608,6 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 
 		for (TSalaryAccount account : aList) {
 			relaySalarySum = relaySalarySum.add(account.getRelaySalaryUnit());
-			saiList = account.getSaiList();
-			account.setSaiList(null);
-			account.setSalaryFormId(salary.getId());
-			tSalaryAccountService.save(account);
-			for (TSalaryAccountItem item : saiList) {
-				item.setSalaryAccountId(account.getId());
-				tSalaryAccountItemService.save(item);
-			}
 		}
 
 		TSalaryDetailVo salaryDetailVo = new TSalaryDetailVo();
@@ -1639,6 +1631,18 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 		//保存工资表
 		tSalaryStandardService.save(salary);
 
+
+		for (TSalaryAccount account : aList) {
+			saiList = account.getSaiList();
+			account.setSaiList(null);
+			account.setSalaryFormId(salary.getId());
+			tSalaryAccountService.save(account);
+			for (TSalaryAccountItem item : saiList) {
+				item.setSalaryAccountId(account.getId());
+				tSalaryAccountItemService.save(item);
+			}
+		}
+
 		// 获取上一个工资条顺序，复制：
 		tSalaryStandardSetService.copyLastSetByDeptId(salary.getId(), dept.getId(), String.valueOf(user.getId()));