fix

code/sapparent/sapcms/src/main/java/org/fouram/controller/ApiController.java

@@ -232,7 +232,7 @@ public class ApiController extends BaseController {
 			return AppUtil.error(ResultConstant.NO_TOKEN, ResultConstant.TOKEN_ERR_MSG);
 		}
 		try {
-			sapUserService.updateSync(dto.getUserId());
+			sapUserService.updateSyncWxResult(dto.getUserId());
 			return AppUtil.success();
 		} catch (Exception e) {
 			LoggerUtil.error(e);

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

@@ -54,10 +54,6 @@
 		order by isPrimary desc, sortNumber asc
 	</select>
 	
-	<select id="selectUnSyncList" resultType="SapUser">
-		select * from sap_user where result is null and delFlag = 0
-	</select>
-	
 	<update id="updateAllDelFlag">
 		update sap_user set delFlag = #{delFlag}
 	</update>

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

@@ -231,11 +231,6 @@ public class SapUserService extends BaseService {
 		return (List<SapUser>) findList("SapUserMapper.selectListByPersonId", personId);
 	}
 
-	@SuppressWarnings("unchecked")
-	public List<SapUser> selectUnSyncList() throws Exception {
-		return (List<SapUser>) findList("SapUserMapper.selectUnSyncList", null);
-	}
-
 	public void updateAllDelFlag(Integer delFlag) throws Exception {
 		update("SapUserMapper.updateAllDelFlag", delFlag);
 	}
@@ -361,7 +356,10 @@ public class SapUserService extends BaseService {
 		update("SapUserMapper.updateResult", sapUser);
 	}
 
-	public void updateSync(String personId) throws Exception {
-		updateSyncWxResult(personId);
+	public void updateAllNormalSyncWxResult() throws Exception {
+		List<SapUser> normalSapUsers = this.selectPrimaryListByResult(SapUserResultEnum.NORMAL.getCode());
+		for (SapUser sapUser : normalSapUsers) {
+			this.updateSyncWxResult(sapUser.getPersonId());
+		}
 	}
 }

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

@@ -1,6 +1,10 @@
 package org.fouram.service;
 
+import java.util.List;
+
 import org.fouram.core.base.service.BaseService;
+import org.fouram.core.plugin.weixin.cp.util.WXCpMessageUtil;
+import org.fouram.entity.SapUser;
 import org.fouram.enums.DelFlagEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -30,21 +34,17 @@ public class SyncSapUserToWxService extends BaseService {
 		sapUserService.updateAbnormalResult();
 		// 更新用户头像
 		sapUserService.updateAvatars();
-
-		// 部分数据插入微信未成功，处理数据后，重新插入
-//		List<SapUser> unSyncSapUsers = sapUserService.selectUnSyncList();
-//		LoggerUtil.info("部分未成功插入数据->" + unSyncSapUsers.size());
-//		for (SapUser sapUser : unSyncSapUsers) {
-//			sapUserService.updateSyncWxResult(sapUser.getPersonId());
-//		}
-//		LoggerUtil.info("同步结束->" + DateUtil.getTime());
+		// NORMAL数据更新同步企业微信
+		sapUserService.updateAllNormalSyncWxResult();
+		// 发送禁用企业微信账号信息
+		this.sendQuitUserMsg();
 	}
 
 	// 发送禁用企业微信账号信息
-//	private void sendQuitUserMsg() throws Exception {
-//		List<SapUser> unableSapUsers = sapUserService.selectListByDelFlag(DelFlagEnum.UNABLE.getCode());
-//		if (unableSapUsers.size() > 0) {
-//			WXCpMessageUtil.sendQuitUserMsg("离职用户" + unableSapUsers.size() + "个，请确认");
-//		}
-//	}
+	private void sendQuitUserMsg() throws Exception {
+		List<SapUser> unableSapUsers = sapUserService.selectPrimaryListByDelFlag(DelFlagEnum.UNABLE.getCode());
+		if (unableSapUsers.size() > 0) {
+			WXCpMessageUtil.sendQuitUserMsg("离职用户" + unableSapUsers.size() + "个，请确认");
+		}
+	}
 }