fix

code/sapparent/sapservice/src/main/java/org/fouram/core/plugin/weixin/cp/util/WXCpUserUtil.java

@@ -26,7 +26,7 @@ public class WXCpUserUtil {
 
 	public static String createOrUpdateForTest(String userId, String name, String[] subCompanyList,
 			String[] departmentList, String position, String mobile, String gender, String email) {
-		WxCpUser user = getByIdOrEmail(userId, email);
+		WxCpUser user = getById(userId);
 		try {
 			if (user == null) {
 				user = getUserForTest(userId, name, subCompanyList, departmentList, position, mobile, gender, email);
@@ -45,7 +45,7 @@ public class WXCpUserUtil {
 	public static String createOrUpdate(String userId, String name, Long[] firstOrgWxDepartIdList,
 			Long[] secondOrgWxDepartIdList, Long[] thirdOrgWxDepartIdList, Long[] fourthOrgWxDepartIdList,
 			String position, String mobile, String gender, String email, String telephone, String firstOrgName) {
-		WxCpUser user = getByIdOrEmail(userId, email);
+		WxCpUser user = getById(userId);
 		try {
 			if (user == null) {
 				user = getUser(userId, name, firstOrgWxDepartIdList, secondOrgWxDepartIdList, thirdOrgWxDepartIdList,
@@ -137,7 +137,7 @@ public class WXCpUserUtil {
 		return user;
 	}
 
-	public static WxCpUser getByIdOrEmail(String userId, String email) {
+	public static WxCpUser getById(String userId) {
 		try {
 			WxCpUser user = userService.getById(userId);
 			if (user != null) {
@@ -145,13 +145,6 @@ public class WXCpUserUtil {
 			}
 		} catch (WxErrorException e) {
 		}
-		try {
-			WxCpUser user = userService.getById(email);
-			if (user != null) {
-				return user;
-			}
-		} catch (WxErrorException e) {
-		}
 		return null;
 	}
 

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

@@ -46,8 +46,6 @@ public class SapUser implements Serializable {
 	// sap职位
 	private String position;
 	private String formatPosition;
-	// 微信职位
-	private String wxPosition;
 	// 手机
 	private String mobile;
 	private String formatMobile;

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

@@ -89,7 +89,6 @@ public class SapUserService extends BaseService {
 		// 获取用户对应职务
 		sapEmpJobService.setPosition(sapUsers);
 		// 更新用户
-		WxCpUser wxCpUser = null;
 		SapUser sapUserDb = null;
 		SapUser sapUser = null;
 		for (int i = 0; i < sapUsers.size(); i++) {
@@ -103,9 +102,6 @@ public class SapUserService extends BaseService {
 					// 用户数据没变，result保留SUCCESS，不用重复同步
 					this.updateDelFlag(sapUser.getUserId(), DelFlagEnum.ENABLE);
 				} else {
-					// 更新微信职务和机构
-					wxCpUser = WXCpUserUtil.getByIdOrEmail(sapUser.getPersonId(), null);
-					sapUser.setWxPosition(wxCpUser.getPosition());
 					this.updateSapUser(sapUser);
 				}
 			}
@@ -120,7 +116,7 @@ public class SapUserService extends BaseService {
 				sapUser.setResult(SapUserResultEnum.ENTRY.getCode());
 				this.updateResult(sapUser);
 				// SENSITIVE("SENSITIVE", "敏感数据")
-			} else if (!sapUser.getPosition().equals(sapUser.getWxPosition()) || checkOrgIsChange(sapUser)) {
+			} else if (checkSensitiveDataIsChange(sapUser)) {
 				sapUser.setResult(SapUserResultEnum.SENSITIVE.getCode());
 				this.updateResult(sapUser);
 			}
@@ -128,7 +124,7 @@ public class SapUserService extends BaseService {
 	}
 
 	
-	private boolean checkOrgIsChange(SapUser sapUser) {
+	private boolean checkSensitiveDataIsChange(SapUser sapUser) {
 		return false;
 	}
 

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

@@ -49,7 +49,7 @@ public class SyncSapUserToWxService extends BaseService {
 	private void updateAvatar() throws Exception {
 		List<SapUser> successUsers = sapUserService.selectListByResult(SapUserResultEnum.SUCCESS.getCode());
 		for (SapUser sapUser : successUsers) {
-			WxCpUser user = WXCpUserUtil.getByIdOrEmail(sapUser.getPersonId(), sapUser.getEmail());
+			WxCpUser user = WXCpUserUtil.getById(sapUser.getPersonId());
 			if (user != null && StringUtils.isNotBlank(user.getAvatar())) {
 				sapUser.setAvatar(user.getAvatar());
 				sapUserService.updateAvatar(sapUser);