fix

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

@@ -59,7 +59,7 @@ public class SapUser implements Serializable {
 	private String formatEmail;
 	private Boolean isPrimary;
 	private String result;
-	private String delFlag;
+	private Integer delFlag;
 	private Date createDate;
 	private Integer sortNumber;
 

code/sapparent/sapservice/src/main/java/org/fouram/enums/DelFlagEnum.java

@@ -2,17 +2,17 @@ package org.fouram.enums;
 
 public enum DelFlagEnum {
 	
-	ENABLE("ENABLE", "有效"), UNABLE("UNABLE", "无效"), DELETED("DELETED", "确认删除");
+	ENABLE(0, "有效"), UNABLE(1, "无效"), DELETED(2, "确认删除");
 
-	private final String code;
+	private final Integer code;
 	private final String desc;
 
-	DelFlagEnum(String code, String desc) {
+	DelFlagEnum(Integer code, String desc) {
 		this.code = code;
 		this.desc = desc;
 	}
 
-	public String getCode() {
+	public Integer getCode() {
 		return code;
 	}
 

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

@@ -21,7 +21,7 @@
 			thirdOrgId=#{thirdOrgId},fourthOrgId=#{fourthOrgId},
 			firstOrgName=#{firstOrgName},secondOrgName=#{secondOrgName},
 			thirdOrgName=#{thirdOrgName},fourthOrgName=#{fourthOrgName},
-			position=#{position},formatPosition=#{formatPosition},
+			position=#{position},formatPosition=#{formatPosition},wxPosition=#{wxPosition},
 			mobile=#{mobile},formatMobile=#{formatMobile},
 			businessPhone=#{businessPhone},formatBusinessPhone=#{formatBusinessPhone},
 			gender=#{gender},email=#{email},formatEmail=#{formatEmail},

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

@@ -25,6 +25,8 @@ import org.springframework.stereotype.Service;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.google.common.collect.Lists;
 
+import me.chanjar.weixin.cp.bean.WxCpUser;
+
 @Service
 public class SapUserService extends BaseService {
 
@@ -87,10 +89,13 @@ 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++) {
-			SapUser sapUser = sapUsers.get(i);
+			sapUser = sapUsers.get(i);
 			sapUser.setSortNumber(i + 1);
-			SapUser sapUserDb = this.selectByUserId(sapUser.getUserId());
+			sapUserDb = this.selectByUserId(sapUser.getUserId());
 			if (sapUserDb == null) {
 				this.saveSapUser(sapUser);
 			} else {
@@ -98,6 +103,9 @@ 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);
 				}
 			}
@@ -195,7 +203,7 @@ public class SapUserService extends BaseService {
 		return (List<SapUser>) findList("SapUserMapper.selectUnSyncList", null);
 	}
 
-	public void updateAllDelFlag(String delFlag) throws Exception {
+	public void updateAllDelFlag(Integer delFlag) throws Exception {
 		update("SapUserMapper.updateAllDelFlag", delFlag);
 	}
 
@@ -222,7 +230,7 @@ public class SapUserService extends BaseService {
 	}
 
 	@SuppressWarnings("unchecked")
-	public List<SapUser> selectListByDelFlag(String delFlag) throws Exception {
+	public List<SapUser> selectListByDelFlag(Integer delFlag) throws Exception {
 		return (List<SapUser>) findList("SapUserMapper.selectListByDelFlag", delFlag);
 	}