fix

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

@@ -29,4 +29,5 @@ public class WxUser implements Serializable {
 	private String secondDepartName;
 	private String departIds;
 	private String position;
+	private Integer delFlag;
 }

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

@@ -2,13 +2,14 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="WxUserMapper">
 	<select id="selectById" resultType="WxUser">
-		select * from wx_user where (userId=#{userId} or userId=#{email}) and delFlag=0
+		select * from wx_user 
+		where (userId=#{userId} or userId=#{email}) and delFlag=#{delFlag}
 	</select>
 
 	<insert id="save">
-		insert into wx_user(userId,name,email,departId,firstDepartName,firstDepartId,
+		insert into wx_user(userId,name,email,mobile,telephone,departId,firstDepartName,firstDepartId,
 			secondDepartName,secondDepartId,departIds,position,sapExists,delFlag) 
-		values (#{userId},#{name},#{email},#{departId},#{firstDepartName},#{firstDepartId},
+		values (#{userId},#{name},#{email},#{mobile},#{telephone},#{departId},#{firstDepartName},#{firstDepartId},
 			#{secondDepartName},#{secondDepartId},#{departIds},#{position},'0','0')
 	</insert>
 	
@@ -18,7 +19,8 @@
 	
 	<update id="update">
 		update wx_user 
-		set name=#{name},email=#{email},departId=#{departId},firstDepartName=#{firstDepartName},
+		set name=#{name},email=#{email},mobile=#{mobile},telephone=#{telephone},
+			departId=#{departId},firstDepartName=#{firstDepartName},
 			firstDepartId=#{firstDepartId},secondDepartName=#{secondDepartName},
 			secondDepartId=#{secondDepartId},departIds=#{departIds},
 			position=#{position},delFlag=0

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

@@ -108,7 +108,8 @@ public class SapUserService extends BaseService {
 		} else if (sapBlacklistService.findByUserId(sapUser.getPersonId()) != null) {
 			return SapUserResultEnum.BLACKLIST.getCode();
 		} else {
-			WxUser wxUser = wxUserService.selectById(sapUser.getPersonId(), sapUser.getEmail());
+			WxUser wxUser = wxUserService.selectById(sapUser.getPersonId(), sapUser.getEmail(),
+					DelFlagEnum.ENABLE.getCode());
 			if (wxUser == null) {
 				return SapUserResultEnum.ENTRY.getCode();
 			} else {
@@ -147,8 +148,9 @@ public class SapUserService extends BaseService {
 		// 查询UNABLE数据，判断已不存在或离职
 		List<SapUser> unableList = selectPrimaryListByDelFlag(DelFlagEnum.UNABLE.getCode());
 		for (SapUser sapUser : unableList) {
-			WxUser wxUser = wxUserService.selectById(sapUser.getPersonId(), sapUser.getEmail());
-			if(wxUser != null) {
+			WxUser wxUser = wxUserService.selectById(sapUser.getPersonId(), sapUser.getEmail(),
+					DelFlagEnum.ENABLE.getCode());
+			if (wxUser != null) {
 				updateResultByUserId(SapUserResultEnum.LEAVE.getCode(), sapUser.getUserId());
 			} else {
 				updateResultByUserId(SapUserResultEnum.NON_EXISTENT.getCode(), sapUser.getUserId());
@@ -308,7 +310,8 @@ public class SapUserService extends BaseService {
 			sapUser.setDepartList(departList);
 			sapUser.setSapPosition(sapUser.getPosition());
 			sapUser.setSapFullDepart(getFullOrgName(sapUser.getPersonId()));
-			WxUser wxUser = wxUserService.selectById(sapUser.getPersonId(), sapUser.getEmail());
+			WxUser wxUser = wxUserService.selectById(sapUser.getPersonId(), sapUser.getEmail(),
+					DelFlagEnum.ENABLE.getCode());
 			if (wxUser != null) {
 				sapUser.setWxPosition(wxUser.getPosition());
 				sapUser.setWxFullDepart(wxUserService.getFullDepartName(sapUser.getPersonId()));

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

@@ -19,7 +19,6 @@ public class SyncSapUserToWxService extends BaseService {
 	@Autowired
 	private SapUserService sapUserService;
 
-	@Transactional
 	public SyncWeixinUserOutput syncWeixinUser() throws Exception {
 		if (WebConstants.CACHE.containsKey(WebConstants.CACHE_SYNC_SAP)) {
 			return SyncWeixinUserOutput.builder().state("同步中")
@@ -40,6 +39,7 @@ public class SyncSapUserToWxService extends BaseService {
 		return SyncWeixinUserOutput.builder().state("正在同步，请稍等").build();
 	}
 
+	@Transactional
 	public void taskBiz() throws Exception {
 		WebConstants.CACHE.put(WebConstants.CACHE_SYNC_SAP, DateUtil.getTime());
 		// 更新所有数据无效

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

@@ -8,6 +8,7 @@ import org.fouram.core.plugin.weixin.cp.util.WXCpUserUtil;
 import org.fouram.entity.WxDepart;
 import org.fouram.entity.WxUser;
 import org.fouram.entity.WxUserDepart;
+import org.fouram.enums.DelFlagEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -49,7 +50,7 @@ public class WxUserService extends BaseService {
 			wxUser.setPosition(user.getPosition());
 			wxUser.setMobile(user.getMobile());
 			wxUser.setTelephone(user.getTelephone());
-			dbUser = selectById(userId, userId);
+			dbUser = selectById(userId, userId, DelFlagEnum.UNABLE.getCode());
 			if (dbUser == null) {
 				save("WxUserMapper.save", wxUser);
 			} else {
@@ -96,8 +97,8 @@ public class WxUserService extends BaseService {
 		return (List<WxUserDepart>) findList("WxUserMapper.selectWxUserDepartsByUserId", userId);
 	}
 
-	public WxUser selectById(String userId, String email) throws Exception {
-		WxUser param = WxUser.builder().userId(userId).email(email).build();
+	public WxUser selectById(String userId, String email, Integer delFlag) throws Exception {
+		WxUser param = WxUser.builder().userId(userId).email(email).delFlag(delFlag).build();
 		return (WxUser) findObject("WxUserMapper.selectById", param);
 	}