fix

code/sapparent/sapservice/src/main/java/org/fouram/entity/SapUser.java

@@ -26,6 +26,20 @@ public class SapUser implements Serializable {
 	private String username;
 	// 姓名
 	private String name;
+	
+	// 原先数据
+	private String firstOrgIdOriginal;
+	private String secondOrgIdOriginal;
+	private String thirdOrgIdOriginal;
+	private String fourthOrgIdOriginal;
+	private String firstOrgNameOriginal;
+	private String secondOrgNameOriginal;
+	private String thirdOrgNameOriginal;
+	private String fourthOrgNameOriginal;
+	private String positionOriginal;
+	private String formatPositionOriginal;
+	
+	// 当前数据
 	private String firstOrgId;
 	private String secondOrgId;
 	private String thirdOrgId;
@@ -40,11 +54,12 @@ public class SapUser implements Serializable {
 	private Long fourthOrgWxDepartId;
 	private String position;
 	private String formatPosition;
-	private String mobile;
+	
 	// 手机
+	private String mobile;
 	private String formatMobile;
-	private String businessPhone;
 	// 座机
+	private String businessPhone;
 	private String formatBusinessPhone;
 	private String gender;
 	private String email;

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

@@ -43,7 +43,7 @@ public class SapUserService extends BaseService {
 	private static boolean isTestWXSync = true;
 	private static boolean isTestMobile = false;
 
-	public List<SapUser> getSapUsers() throws Exception {
+	public List<SapUser> getUsersFromSap() throws Exception {
 		HttpHeaders headers = getHttpHeaders();
 		String userUrl = "https://api15.sapsf.cn/odata/v2/User?$filter=status in 'active'&$format=json&$expand=personKeyNav";
 		// get

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

@@ -27,20 +27,21 @@ public class TaskService extends BaseService {
 	@Transactional
 	public void syncWeixinUser() throws Exception {
 		LoggerUtil.info("同步开始->" + DateUtil.getTime());
+
 		// 更新所有数据删除
 		sapUserService.updateAllDelete();
 
 		// 获取SAP所有用户数据
-		List<SapUser> getSapUsers = sapUserService.getSapUsers();
+		List<SapUser> sapUsers = sapUserService.getUsersFromSap();
 
 		// 根据机构获取对应企业微信id，同时更新企业微信对应部门名称
 		Map<String, Long> orgWxDepartMap = sapOrgService.updateAllWxDepartId();
 
-		LoggerUtil.info("接口获取所有有效数据->" + getSapUsers.size());
+		LoggerUtil.info("接口获取所有有效数据->" + sapUsers.size());
 
 		// 遍历用户，企业微信用户没有，新增用户并且同步企业微信；数据已有情况，数据未发生变化的，更新为未删除；数据发生变化的，同步微信用户，更新为未删除
-		for (int i = 0; i < getSapUsers.size(); i++) {
-			SapUser sapUser = getSapUsers.get(i);
+		for (int i = 0; i < sapUsers.size(); i++) {
+			SapUser sapUser = sapUsers.get(i);
 			sapUser.setFirstOrgWxDepartId(orgWxDepartMap.get(sapUser.getFirstOrgId()));
 			sapUser.setSecondOrgWxDepartId(orgWxDepartMap.get(sapUser.getSecondOrgId()));
 			sapUser.setThirdOrgWxDepartId(orgWxDepartMap.get(sapUser.getThirdOrgId()));
@@ -72,7 +73,7 @@ public class TaskService extends BaseService {
 		List<SapUser> unableSapUsers = sapUserService.selectDeleteList();
 		LoggerUtil.info("SAP禁用数据->" + unableSapUsers.size());
 		if (unableSapUsers.size() > 0) {
-			WXCpMessageUtil.sendQuitUserMsg("离职用户"+unableSapUsers.size()+"个，请确认");
+			WXCpMessageUtil.sendQuitUserMsg("离职用户" + unableSapUsers.size() + "个，请确认");
 		}
 
 		// 部分数据插入微信未成功，处理数据后，重新插入