fix

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

@@ -17,6 +17,7 @@ import org.fouram.core.util.AppUtil.ResultConstant;
 import org.fouram.core.util.ConfConfig;
 import org.fouram.core.util.LoggerUtil;
 import org.fouram.entity.SapOrg;
+import org.fouram.entity.SapUser;
 import org.fouram.service.SapOrgService;
 import org.fouram.service.SapUserService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -148,6 +149,50 @@ public class ApiController extends BaseController {
 			return AppUtil.error(ResultConstant.WEB_ERR_MSG);
 		}
 	}
+	
+	/**
+	 * 查询离职员工列表
+	 *
+	 * @return
+	 */
+	@RequestMapping(value = "/getQuitUserList", produces = "application/json;charset=utf-8")
+	@ResponseBody
+	public Object getQuitUserList(HttpServletRequest request) {
+		if (!isLogin(request)) {
+			return AppUtil.error(ResultConstant.NO_TOKEN, ResultConstant.TOKEN_ERR_MSG);
+		}
+		try {
+			return AppUtil.success(sapUserService.selectDeleteList(), null);
+		} catch (Exception e) {
+			LoggerUtil.error(e);
+			return AppUtil.error(ResultConstant.WEB_ERR_MSG);
+		}
+	}
+	
+	/**
+	 * 删除离职员工
+	 *
+	 * @return
+	 */
+	@RequestMapping(value = "/deleteQuitUserByUserId", produces = "application/json;charset=utf-8")
+	@ResponseBody
+	public Object deleteQuitUserByUserId(HttpServletRequest request) {
+		if (!isLogin(request)) {
+			return AppUtil.error(ResultConstant.NO_TOKEN, ResultConstant.TOKEN_ERR_MSG);
+		}
+		try {
+			String userId = getPageData().getString("userId");
+			SapUser sapUser = sapUserService.selectByUserId(userId);
+			if(!sapUser.getDelFlag()) {
+				return AppUtil.error("该用户ID不是离职数据");
+			}
+			sapUserService.deleteQuitUserByUserId(userId);
+			return AppUtil.success();
+		} catch (Exception e) {
+			LoggerUtil.error(e);
+			return AppUtil.error(ResultConstant.WEB_ERR_MSG);
+		}
+	}
 
 	/**
 	 * 判断是否经过授权

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

@@ -89,7 +89,6 @@ public class WXCpUserUtil {
 			user.setTelephone(telephone);
 		}
 		user.setToInvite(false);
-		user.setEnable(1); // 启用/禁用成员。1表示启用成员，0表示禁用成员
 		ExternalAttribute attribute = ExternalAttribute.builder().name("所属公司").type(0).value(firstOrgName).build();
 		user.addExternalAttr(attribute);
 		return user;
@@ -126,7 +125,6 @@ public class WXCpUserUtil {
 			user.setEmail(email);
 		}
 		user.setToInvite(false);
-		user.setEnable(1); // 启用/禁用成员。1表示启用成员，0表示禁用成员
 		ExternalAttribute attribute = ExternalAttribute.builder().name("所属公司").type(0).value(subCompanyList[0]).build();
 		user.addExternalAttr(attribute);
 		return user;
@@ -140,14 +138,13 @@ public class WXCpUserUtil {
 		}
 	}
 	
-	public static void updateUnable(String userId) throws WxErrorException {
-		WxCpUser wxUser = getById(userId);
-		if(wxUser != null) {
-			wxUser.setEnable(0); // 启用/禁用成员。1表示启用成员，0表示禁用成员
-			updateUser(wxUser);
+	public static void delete(String userId) {
+		try {
+			userService.delete(userId);
+		} catch (WxErrorException e) {
 		}
 	}
-
+	
 	public static List<WxCpUser> listByDepartment(Long departId) throws WxErrorException {
 		return userService.listByDepartment(departId, true, 0);
 	}

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

@@ -58,7 +58,7 @@
 	</select>
 	
 	<select id="selectDeleteList" resultType="SapUser">
-		select * from sap_user where delFlag = 1
+		select * from sap_user where delFlag = 1 and isPrimary = 1
 	</select>
 	
 	<update id="updateAllDelete">

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

@@ -243,4 +243,9 @@ public class SapUserService extends BaseService {
 	public void updateAvatar(SapUser sapUser) throws Exception {
 		update("SapUserMapper.updateAvatar", sapUser);
 	}
+
+	public void deleteQuitUserByUserId(String userId) throws Exception {
+//		SapUser sapUser = selectByUserId(userId);
+//		WXCpUserUtil.delete(sapUser.getPersonId());
+	}
 }

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

@@ -70,12 +70,6 @@ public class TaskService extends BaseService {
 		// 查询禁用企业微信账号
 		List<SapUser> unableSapUsers = sapUserService.selectDeleteList();
 		LoggerUtil.info("SAP禁用数据->" + unableSapUsers.size());
-		// 防止极端情况导致大批量被禁用
-//		if(unableSapUsers.size() < 20) {
-//			for(SapUser sapUser : unableSapUsers) {
-//				WXCpUserUtil.updateUnable(sapUser.getPersonId());
-//			}
-//		}
 
 		// 部分数据插入微信未成功，处理数据后，重新插入
 		List<SapUser> unSyncSapUsers = sapUserService.selectUnSyncList();