fix

code/sapparent/sapcms/src/main/java/org/fouram/controller/TestController.java

@@ -44,9 +44,9 @@ public class TestController extends BaseController {
 		List<SapUser> users = sapUserService.selectLeaveAndEntryList(dto.getDate());
 		for (SapUser user : users) {
 			if (StringUtils.isNotBlank(user.getEndDate())) {
-				sapUserService.uploadHrEmpUserInfo(user, UploadHrEmpUserEnum.LEAVE.getCode(), true);
+				sapUserService.uploadDevHrEmpUserInfo(user, UploadHrEmpUserEnum.LEAVE.getCode());
 			} else {
-				sapUserService.uploadHrEmpUserInfo(user, UploadHrEmpUserEnum.ENTRY.getCode(), true);
+				sapUserService.uploadDevHrEmpUserInfo(user, UploadHrEmpUserEnum.ENTRY.getCode());
 			}
 		}
 		return AppUtil.success();
@@ -58,9 +58,9 @@ public class TestController extends BaseController {
 		List<SapUser> users = sapUserService.selectLeaveAndEntryList(dto.getDate());
 		for (SapUser user : users) {
 			if (StringUtils.isNotBlank(user.getEndDate())) {
-				sapUserService.uploadHrEmpUserInfo(user, UploadHrEmpUserEnum.LEAVE.getCode(), false);
+				sapUserService.uploadMasHrEmpUserInfo(user, UploadHrEmpUserEnum.LEAVE.getCode());
 			} else {
-				sapUserService.uploadHrEmpUserInfo(user, UploadHrEmpUserEnum.ENTRY.getCode(), false);
+				sapUserService.uploadMasHrEmpUserInfo(user, UploadHrEmpUserEnum.ENTRY.getCode());
 			}
 		}
 		return AppUtil.success();

code/sapparent/sapservice/src/main/java/org/fouram/job/MessageSchedule.java

@@ -38,7 +38,7 @@ public class MessageSchedule {
 						.append("<a href=\"https://studybom.suggest.vip/#/userSync/list\">立即同步</a>");
 				sapUserService.sendEntryMessage(messageContent.toString(), sapUser, messageUsers);
 				
-				sapUserService.uploadHrEmpUserInfo(sapUser, UploadHrEmpUserEnum.ENTRY.getCode(), false);
+				sapUserService.uploadMasHrEmpUserInfo(sapUser, UploadHrEmpUserEnum.ENTRY.getCode());
 			}
 			// 离职
 			sapUsers = sapUserService.selectNotSendLeaveMessageList();
@@ -51,7 +51,7 @@ public class MessageSchedule {
 						.append("<a href=\"https://studybom.suggest.vip/#/userSync/list\">立即同步</a>");
 				sapUserService.sendLeaveMessage(messageContent.toString(), sapUser, messageUsers);
 				
-				sapUserService.uploadHrEmpUserInfo(sapUser, UploadHrEmpUserEnum.LEAVE.getCode(), false);
+				sapUserService.uploadMasHrEmpUserInfo(sapUser, UploadHrEmpUserEnum.LEAVE.getCode());
 			}
 		} catch (Exception e) {
 			WXCpMessageUtil.sendAdminError(Tools.getExceptionAllInfo(e));

code/sapparent/sapservice/src/main/java/org/fouram/service/SapUserService.java

@@ -528,13 +528,22 @@ public class SapUserService extends BaseService {
 		return (List<SapUser>) findList("SapUserMapper.selectLeaveAndEntryList", date);
 	}
 
-	public void uploadHrEmpUserInfo(SapUser user, Integer type, boolean devFlag) throws Exception {
+	public void uploadDevHrEmpUserInfo(SapUser user, Integer type) throws Exception {
+		uploadHrEmpUserInfo(user, type, true);
+	}
+
+	public void uploadMasHrEmpUserInfo(SapUser user, Integer type) throws Exception {
+		uploadHrEmpUserInfo(user, type, false);
+
+	}
+
+	private void uploadHrEmpUserInfo(SapUser user, Integer type, boolean devFlag) throws Exception {
 		UploadModifyEmpDTO reqdata = UploadModifyEmpDTO.builder().username(user.getName())
 				.entryDate(user.getStartDate()).resignDate(user.getEndDate()).type(type).phone(user.getFormatMobile())
 				.cardId(user.getCardId()).cardType(CardTypeEnum.getEnumBySapCode(user.getCardType()).getMyCode())
 				.jobNumber(user.getJobNumber()).build();
 		String url = "http://cmcadmin.info666.com/hr/emp/modifyEmpInfo";
-		if(!devFlag) {
+		if (!devFlag) {
 			url = "manage.inet.cmcinc.cn/hr/emp/modifyEmpInfo";
 		}
 		JSONObject parameters = new JSONObject();