Merge remote-tracking branch 'origin/MVP1.5.6' into MVP1.5.6

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

@@ -844,8 +844,9 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
 			if (salaryList != null && !salaryList.isEmpty()) {
 				TSalaryStandard ss = salaryList.get(0);
 				if (ss.getStatus() != SalaryConstants.STATUS[6]) {
+					YifuUser user = SecurityUtils.getUser();
 					// 异步-收入相关
-					doSalaryAsync.doBackSalary(applyNo, ss);
+					doSalaryAsync.doBackSalary(applyNo, ss, user);
 					return R.ok();
 				} else {
 					return R.failed("工资表已退回，请不要重复操作");

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/util/DoJointSalaryAsyncTask.java

@@ -226,12 +226,11 @@ public class DoJointSalaryAsyncTask {
 	 * @return: void
 	 **/
 	@Async
-	public void doBackSalary(String applyNo, TSalaryStandard ss) {
+	public void doBackSalary(String applyNo, TSalaryStandard ss, YifuUser user) {
 		EkpSalaryBackParam param = new EkpSalaryBackParam();
 		param.setFd_3b3c293745e7b4(ss.getDeptName());
 		param.setFd_3b3c2935c13056(ss.getDeptNo());
 		param.setFd_3b3c293811c0ee(ss.getApplyNo());
-		YifuUser user = SecurityUtils.getUser();
 		if (user != null) {
 			param.setFd_3b422d73d73e02(user.getUsername());
 		} else {

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

@@ -69,7 +69,6 @@ import com.yifu.cloud.plus.v1.yifu.social.util.ServiceUtil;
 import com.yifu.cloud.plus.v1.yifu.social.vo.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
-import org.apache.ibatis.annotations.Param;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.shardingsphere.transaction.annotation.ShardingTransactionType;
@@ -5322,7 +5321,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 					excelWriter.write(new ArrayList<>(), writeSheet, writeTable4);
 				}
 			} else {
-				writeSheet = EasyExcel.writerSheet("2023").build();
+				writeSheet = EasyExcel.writerSheet("增员").build();
 				excelWriter.write(new ArrayList<>(), writeSheet, writeTable0);
 				excelWriter.write(new ArrayList<>(), writeSheet, writeTable1);
 				int num = 1;