fix

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

@@ -31,8 +31,10 @@ public class SapUser implements Serializable {
 	private String mobile;
 	private String formatMobile;
 	private String businessPhone;
+	private String formatBusinessPhone;
 	private String gender;
 	private String email;
+	private String formatEmail;
 	private Boolean isPrimary;
 	private String result;
 	private Boolean delFlag;

code/sapparent/sapservice/src/main/java/org/fouram/mapper/SapUserMapper.xml

@@ -4,12 +4,12 @@
 	<insert id="saveOne">
 		insert into sap_user(userId,personId,username,name,
 			firstOrg,secondOrg,thirdOrg,fourthOrg,
-			position,formatPosition,mobile,formatMobile,businessPhone,gender,
-			email,isPrimary,delFlag,createDate) 
+			position,formatPosition,mobile,formatMobile,businessPhone,formatBusinessPhone,gender,
+			email,formatEmail,isPrimary,delFlag,createDate) 
 		values (#{userId},#{personId},#{username},#{name},
 			#{firstOrg},#{secondOrg},#{thirdOrg},#{fourthOrg},
-			#{position},#{formatPosition},#{mobile},#{formatMobile},#{businessPhone},#{gender},
-			#{email},#{isPrimary},#{delFlag},#{createDate})
+			#{position},#{formatPosition},#{mobile},#{formatMobile},#{businessPhone},#{formatBusinessPhone},#{gender},
+			#{email},#{formatEmail},#{isPrimary},#{delFlag},#{createDate})
 	</insert>
 	
 	<update id="updateOne">
@@ -17,7 +17,8 @@
 		set username=#{username},name=#{name},personId=#{personId},
 			firstOrg=#{firstOrg},secondOrg=#{secondOrg},thirdOrg=#{thirdOrg},fourthOrg=#{fourthOrg},
 			position=#{position},formatPosition=#{formatPosition},
-			mobile=#{mobile},formatMobile=#{formatMobile},businessPhone=#{businessPhone},gender=#{gender},email=#{email},
+			mobile=#{mobile},formatMobile=#{formatMobile},businessPhone=#{businessPhone},formatBusinessPhone=#{formatBusinessPhone},
+			gender=#{gender},email=#{email},formatEmail=#{formatEmail},
 			isPrimary=#{isPrimary},delFlag=#{delFlag}
 		where userId=#{userId}
 	</update>

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

@@ -30,7 +30,6 @@ public class SapUserService extends BaseService {
 	private SapPersonalService sapPersonalService;
 
 	private static boolean isTestWXSync = true;
-//	private static boolean isTestWXSync = false;
 
 	public List<SapUser> getSapUsers() throws Exception {
 		HttpHeaders headers = getHttpHeaders();
@@ -54,8 +53,8 @@ public class SapUserService extends BaseService {
 					String formatMobile = formatMobile(mobile).trim();
 					String email = userNode.get("email").asText().trim();
 					String personId = null;
-					JsonNode personKeyNav =  userNode.get("personKeyNav");
-					if(personKeyNav != null && personKeyNav.get("personIdExternal") != null) {
+					JsonNode personKeyNav = userNode.get("personKeyNav");
+					if (personKeyNav != null && personKeyNav.get("personIdExternal") != null) {
 						personId = personKeyNav.get("personIdExternal").asText().trim();
 					}
 					// 手机号码脱敏
@@ -67,7 +66,8 @@ public class SapUserService extends BaseService {
 					// 员工信息
 					SapUser sapUser = SapUser.builder().userId(userId).personId(personId).username(username).name(name)
 							.position(position).formatPosition(formatPosition).mobile(mobile).formatMobile(formatMobile)
-							.businessPhone(businessPhone).email(email).isPrimary(userId.equals(personId)).build();
+							.businessPhone(businessPhone).formatBusinessPhone(businessPhone).email(email)
+							.formatEmail(email).isPrimary(userId.equals(personId)).build();
 					sapUsers.add(sapUser);
 				}
 			}
@@ -131,6 +131,7 @@ public class SapUserService extends BaseService {
 		if (isTestWXSync) {
 			return "Success";
 		}
+		System.out.println(personId);
 		List<SapUser> sapUsers = selectListByPersonId(personId);
 		SapUser wxSapUser = sapUsers.get(0);
 		String[] firstOrgList = new String[sapUsers.size()];
@@ -150,7 +151,7 @@ public class SapUserService extends BaseService {
 		}
 		return WXCpUserUtil.createOrUpdate(personId, wxSapUser.getName(), firstOrgList, secondOrgList, thirdOrgList,
 				fourthOrgList, wxSapUser.getFormatPosition(), wxSapUser.getFormatMobile(), wxSapUser.getGender(),
-				wxSapUser.getEmail());
+				wxSapUser.getFormatEmail(), wxSapUser.getFormatBusinessPhone());
 	}
 
 	public String checkSapUser(SapUser sapUser) {
@@ -184,7 +185,7 @@ public class SapUserService extends BaseService {
 	public void updateAllDelete() throws Exception {
 		update("SapUserMapper.updateAllDelete", null);
 	}
-	
+
 	public static void main(String[] args) {
 		StringBuilder stringBuilder = new StringBuilder();
 		String sapApiUser = "API01@cmccoltd:cmccoltd123";

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

@@ -1,63 +1,62 @@
-package org.fouram.service;
-
-import java.util.List;
-
-import org.fouram.core.base.service.BaseService;
-import org.fouram.core.plugin.weixin.cp.util.WXCpUserUtil;
-import org.fouram.core.util.DateUtil;
-import org.fouram.core.util.LoggerUtil;
-import org.fouram.entity.SapUser;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-@Service
-public class TaskService extends BaseService {
-
-	@Autowired
-	private SapUserService sapUserService;
-
-	public void syncWeixinUser() {
-		LoggerUtil.info("同步开始->" + DateUtil.getTime());
-		try {
-			// 更新数据删除
-			sapUserService.updateAllDelete();
-			// 接口获取所有有效数据，保存或者更新delFlag=0
-			List<SapUser> getSapUsers = sapUserService.getSapUsers();
-			LoggerUtil.info("接口获取所有有效数据->" + getSapUsers.size());
-			for (SapUser sapUser : getSapUsers) {
-				SapUser sapUserDb = sapUserService.selectOne(sapUser.getUserId());
-				if (sapUserDb == null) {
-					sapUserService.saveOneAndSyncWX(sapUser);
-				} else {
-					if (!isEquals(sapUserDb, sapUser)) {
-						sapUserService.updateOneAndSyncWX(sapUser);
-					}else {
-						sapUserService.updateEnable(sapUser.getUserId());
-					}
-				}
-			}
-			// 查询未更新delFlag数据对应企业微信账号
-			List<SapUser> deleteSapUsers = sapUserService.selectDeleteList();
-			LoggerUtil.info("SAP删除数据->" + deleteSapUsers.size());
-			for(SapUser sapUser : deleteSapUsers) {
-				WXCpUserUtil.delete(sapUser.getPersonId());
-			}
-			// 部分数据插入微信未成功，处理数据后，重新插入
-			List<SapUser> unSyncSapUsers = sapUserService.selectUnSyncList();
-			LoggerUtil.info("部分未成功插入数据->" + unSyncSapUsers.size());
-			for (SapUser sapUser : unSyncSapUsers) {
-				sapUserService.updateOneAndSyncWX(sapUser);
-			}
-		} catch (Exception e) {
-			LoggerUtil.error(e);
-		}
-		LoggerUtil.info("同步结束->" + DateUtil.getTime());
-	}
-
-	private boolean isEquals(SapUser sapUserDb, SapUser sapUser) {
-		if (sapUserDb.toCompareString().equals(sapUser.toCompareString())) {
-			return true;
-		}
-		return false;
-	}
-}
+package org.fouram.service;
+
+import java.util.List;
+
+import org.fouram.core.base.service.BaseService;
+import org.fouram.core.util.DateUtil;
+import org.fouram.core.util.LoggerUtil;
+import org.fouram.entity.SapUser;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class TaskService extends BaseService {
+
+	@Autowired
+	private SapUserService sapUserService;
+
+	public void syncWeixinUser() {
+		LoggerUtil.info("同步开始->" + DateUtil.getTime());
+		try {
+			// 更新数据删除
+//			sapUserService.updateAllDelete();
+			// 接口获取所有有效数据，保存或者更新delFlag=0
+			List<SapUser> getSapUsers = sapUserService.getSapUsers();
+			LoggerUtil.info("接口获取所有有效数据->" + getSapUsers.size());
+			for (SapUser sapUser : getSapUsers) {
+				SapUser sapUserDb = sapUserService.selectOne(sapUser.getUserId());
+				if (sapUserDb == null) {
+					sapUserService.saveOneAndSyncWX(sapUser);
+				} else {
+					if (!isEquals(sapUserDb, sapUser)) {
+						sapUserService.updateOneAndSyncWX(sapUser);
+					}else {
+//						sapUserService.updateEnable(sapUser.getUserId());
+					}
+				}
+			}
+			// 查询未更新delFlag数据对应企业微信账号
+//			List<SapUser> deleteSapUsers = sapUserService.selectDeleteList();
+//			LoggerUtil.info("SAP删除数据->" + deleteSapUsers.size());
+//			for(SapUser sapUser : deleteSapUsers) {
+//				WXCpUserUtil.delete(sapUser.getPersonId());
+//			}
+			// 部分数据插入微信未成功，处理数据后，重新插入
+			List<SapUser> unSyncSapUsers = sapUserService.selectUnSyncList();
+			LoggerUtil.info("部分未成功插入数据->" + unSyncSapUsers.size());
+			for (SapUser sapUser : unSyncSapUsers) {
+				sapUserService.updateOneAndSyncWX(sapUser);
+			}
+		} catch (Exception e) {
+			LoggerUtil.error(e);
+		}
+		LoggerUtil.info("同步结束->" + DateUtil.getTime());
+	}
+
+	private boolean isEquals(SapUser sapUserDb, SapUser sapUser) {
+		if (sapUserDb.toCompareString().equals(sapUser.toCompareString())) {
+			return true;
+		}
+		return false;
+	}
+}