优化查询条件

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

@@ -594,9 +594,15 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
 						standardParam.setFd_3b3d3ec85bfeb0(s.getSalaryMonth().substring(0,4)
 								+ CommonConstants.CENTER_SPLIT_LINE_STRING + s.getSalaryMonth().substring(4,6));
 						// 推送主表信息
-						sendBack = ekpSalaryUtil.sendStandardToEKP(s.getCreateName(), standardParam);
+						String loginName;
+						if (user != null) {
+							loginName = user.getUsername();
+						} else {
+							loginName = s.getCreateName();
+						}
+						sendBack = ekpSalaryUtil.sendStandardToEKP(loginName, standardParam);
 						if (Common.isEmpty(sendBack) || sendBack.length() != 32) {
-							sendBack = ekpSalaryUtil.sendStandardToEKP(s.getCreateName(), standardParam);
+							sendBack = ekpSalaryUtil.sendStandardToEKP(loginName, standardParam);
 						}
 						s.setSendTime(new Date());
 						s.setSendMonth(nowMonth);
@@ -901,9 +907,16 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
 				param.setFd_3b3c293745e7b4(ss.getDeptName());
 				param.setFd_3b3c2935c13056(ss.getDeptNo());
 				param.setFd_3b3c293811c0ee(ss.getApplyNo());
-				String sendBack = ekpSalaryUtil.backStandardToEKP(ss.getCreateName(), param);
+				YifuUser user = SecurityUtils.getUser();
+				String loginName;
+				if (user != null) {
+					loginName = user.getUsername();
+				} else {
+					loginName = ss.getCreateName();
+				}
+				String sendBack = ekpSalaryUtil.backStandardToEKP(loginName, param);
 				if (Common.isEmpty(sendBack) || sendBack.length() != 32) {
-					sendBack = ekpSalaryUtil.backStandardToEKP(ss.getCreateName(), param);
+					sendBack = ekpSalaryUtil.backStandardToEKP(loginName, param);
 				}
 				if (Common.isNotNull(sendBack) && sendBack.length() == 32) {
 					// 更新薪资为确认不通过
@@ -922,7 +935,6 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
 							, "/tincome/inner/deleteIncomeAndDetailByApplyNo", income
 							, Object.class, SecurityConstants.FROM_IN);
 					// 添加流程进展明细
-					YifuUser user = SecurityUtils.getUser();
 					if (user != null) {
 						this.saveRecordLog(ss, user, CommonConstants.ZERO_STRING, "从EKP退表");
 					}