fix

code/sapparent/sapservice/src/main/java/org/fouram/constants/WebConstants.java

@@ -21,4 +21,9 @@ public final class WebConstants {
 	
 	// userId->name键值对
 	public static final Map<String, String> NAME_MAP = Maps.newHashMap();
+	
+	public static final String ORG1 = "FOBusinessUnit";
+	public static final String ORG2 = "FODivision";
+	public static final String ORG3 = "FODepartment";
+	public static final String ORG4 = "cust_org4";
 }

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

@@ -22,9 +22,9 @@ public class SapUser implements Serializable {
 	private String userId;
 	private String personId;
 	private String avatar;
-	//邮箱
+	// 邮箱
 	private String username;
-	//姓名
+	// 姓名
 	private String name;
 	private String firstOrgId;
 	private String secondOrgId;
@@ -41,10 +41,10 @@ public class SapUser implements Serializable {
 	private String position;
 	private String formatPosition;
 	private String mobile;
-	//手机
+	// 手机
 	private String formatMobile;
 	private String businessPhone;
-	//座机
+	// 座机
 	private String formatBusinessPhone;
 	private String gender;
 	private String email;
@@ -59,9 +59,9 @@ public class SapUser implements Serializable {
 
 	public String toCompareString() {
 		StringBuilder sBuilder = new StringBuilder();
-		sBuilder.append(userId).append(personId).append(name).append(firstOrgId).append(secondOrgId)
-				.append(thirdOrgId).append(fourthOrgId).append(position).append(mobile).append(businessPhone)
-				.append(gender).append(email).append(isPrimary);
+		sBuilder.append(userId).append(personId).append(username).append(name).append(firstOrgName)
+				.append(secondOrgName).append(thirdOrgName).append(fourthOrgName).append(position).append(mobile)
+				.append(businessPhone).append(gender).append(email).append(isPrimary);
 		return sBuilder.toString();
 	}
 }

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

@@ -39,10 +39,9 @@ public class SapOrgService extends BaseService {
 				JsonNode userNode = iterator.next();
 				String externalCode = userNode.get("externalCode").asText().trim();
 				String externalName = null;
-				if (userNode.get("externalName") != null) {
-					externalName = userNode.get("externalName").asText().trim();
-				} else if (userNode.get("name") != null) {
-					externalName = userNode.get("name").asText().trim();
+				if (WebConstants.ORG1.equals(entityName) || WebConstants.ORG2.equals(entityName)
+						|| WebConstants.ORG3.equals(entityName)) {
+					externalName = userNode.get("name_zh_CN").asText().trim();
 				} else {
 					externalName = userNode.get("externalName_zh_CN").asText().trim();
 				}
@@ -72,10 +71,10 @@ public class SapOrgService extends BaseService {
 
 	public List<SapUser> setOrg(List<SapUser> sapUsers) throws Exception {
 		HttpHeaders headers = getHttpHeaders();
-		Map<String, String> businessUnitMap = getOrgMap(headers, "FOBusinessUnit");
-		Map<String, String> divisionMap = getOrgMap(headers, "FODivision");
-		Map<String, String> departmentMap = getOrgMap(headers, "FODepartment");
-		Map<String, String> orgunit4Map = getOrgMap(headers, "cust_org4");// cust_orgunit4/cust_org4
+		Map<String, String> businessUnitMap = getOrgMap(headers, WebConstants.ORG1);
+		Map<String, String> divisionMap = getOrgMap(headers, WebConstants.ORG2);
+		Map<String, String> departmentMap = getOrgMap(headers, WebConstants.ORG3);
+		Map<String, String> orgunit4Map = getOrgMap(headers, WebConstants.ORG4);// cust_orgunit4/cust_org4
 
 		String userIds = "";
 		Map<String, SapUser> map = Maps.newHashMap();
@@ -165,22 +164,22 @@ public class SapOrgService extends BaseService {
 		SapOrg org = SapOrg.builder().parentId(parentId).build();
 		return toInfoDetails((List<SapOrg>) findList("SapOrgMapper.selectListByParentId", org));
 	}
-	
+
 	public void updateWxDepartId(SapOrg org) throws Exception {
 		update("SapOrgMapper.updateWxDepartId", org);
 	}
-	
+
 	@SuppressWarnings("unchecked")
 	public List<SapOrg> selectListByName(String name) throws Exception {
 		return toInfoDetails((List<SapOrg>) findList("SapOrgMapper.selectListByName", name));
 	}
-	
+
 	public SapOrg selectById(String id) throws Exception {
 		return (SapOrg) findObject("SapOrgMapper.selectById", id);
 	}
-	
+
 	public SapOrg toInfoDetail(SapOrg sapOrg) throws Exception {
-		if(sapOrg != null) {
+		if (sapOrg != null) {
 			sapOrg.setParentDepart(selectById(sapOrg.getParentId()));
 		}
 		return sapOrg;

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

@@ -70,9 +70,9 @@ public class TaskService extends BaseService {
 		// 查询未更新delFlag数据对应企业微信账号
 		List<SapUser> deleteSapUsers = sapUserService.selectDeleteList();
 		LoggerUtil.info("SAP删除数据->" + deleteSapUsers.size());
-//		for(SapUser sapUser : deleteSapUsers) {
-//			WXCpUserUtil.delete(sapUser.getPersonId());
-//		}
+		for(SapUser sapUser : deleteSapUsers) {
+			WXCpUserUtil.delete(sapUser.getPersonId());
+		}
 
 		// 部分数据插入微信未成功，处理数据后，重新插入
 		List<SapUser> unSyncSapUsers = sapUserService.selectUnSyncList();