fix：成员删除回调，判断成员在企微是否存在，并且已激活

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MessageApiServiceImpl.java

@@ -14,7 +14,10 @@ import com.gic.haoban.manage.api.enums.AppPageType;
 import com.gic.haoban.manage.api.enums.NoticeMessageTypeEnum;
 import com.gic.haoban.manage.api.enums.SecretTypeEnum;
 import com.gic.haoban.manage.api.enums.WxEditType;
-import com.gic.haoban.manage.api.service.*;
+import com.gic.haoban.manage.api.service.MessageApiService;
+import com.gic.haoban.manage.api.service.StaffApiService;
+import com.gic.haoban.manage.api.service.StaffClerkRelationApiService;
+import com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService;
 import com.gic.haoban.manage.api.util.notify.NoticeMessageUtil;
 import com.gic.haoban.manage.service.config.Config;
 import com.gic.haoban.manage.service.entity.*;
@@ -25,8 +28,10 @@ import com.gic.thirdparty.api.dto.PicUploadResDTO;
 import com.gic.thirdparty.api.service.QQCloudPicService;
 import com.gic.wechat.api.dto.qywx.ItemDTO;
 import com.gic.wechat.api.dto.qywx.QywxXcxSendMessageDTO;
+import com.gic.wechat.api.dto.qywx.UserDTO;
 import com.gic.wechat.api.service.qywx.QywxDepartmentApiService;
 import com.gic.wechat.api.service.qywx.QywxSuiteApiService;
+import com.gic.wechat.api.service.qywx.QywxUserApiService;
 import com.google.common.collect.Sets;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -58,8 +63,6 @@ public class MessageApiServiceImpl implements MessageApiService {
     @Autowired
     private DepartmentService departmentService;
     @Autowired
-    private WxEnterpriseService enterpriseService;
-    @Autowired
     private StaffService staffService;
     @Autowired
     private StaffDepartmentRelatedService staffDepartmentRelatedService;
@@ -93,9 +96,9 @@ public class MessageApiServiceImpl implements MessageApiService {
     @Autowired
     private SecretSettingService secretSettingService;
     @Autowired
-    private WxApplicationApiService wxApplicationApiService;
-    @Autowired
     private WxApplicationService wxApplicationService;
+    @Autowired
+    private QywxUserApiService qywxUserApiService;
 
     @Override
     public void gicMessageReceive(GicMessageDTO gicMessageDTO) {
@@ -218,9 +221,10 @@ public class MessageApiServiceImpl implements MessageApiService {
             log.info("成员为空");
             return;
         }
-        TabHaobanWxApplication wxApplication = wxApplicationService.selectByCorpId(qywxCallBackDTO.getAuthCorpId());
+        String corpId = qywxCallBackDTO.getAuthCorpId();
+        TabHaobanWxApplication wxApplication = wxApplicationService.selectByCorpId(corpId);
         if (Objects.isNull(wxApplication)) {
-            log.info("授权企业不存在，{}", qywxCallBackDTO.getAuthCorpId());
+            log.info("授权企业不存在，{}", corpId);
             return;
         }
         String wxEnterpriseId = wxApplication.getWxEnterpriseId();
@@ -286,6 +290,22 @@ public class MessageApiServiceImpl implements MessageApiService {
             staffApiService.staffEdit(staffDTO, departmentIds.toString());
         } else if (changeType.equals(WxEditType.DELETE_USER.getCode())) {
             log.info("成员同步删除，userid:{}", userid);
+            SecretSettingDTO secretSetting = secretSettingService.getSecretSetting(wxEnterpriseId, SecretTypeEnum.HAOBAN_HELP.getVal());
+            if (null == secretSetting || secretSetting.getCheckFlag() == 0) {
+                log.info("没有配置secret,wxEnterpriseId:{}", wxEnterpriseId);
+                return;
+            }
+
+            UserDTO user = qywxUserApiService.getSelfWorkWxUser(corpId, secretSetting.getSecretVal(), userid);
+            if (null != user) {
+                Integer status = user.getStatus();
+                // 1=已激活，2=已禁用，4=未激活，5=退出企业。
+                log.info("企业微信用户状态：{}",status);
+                if (status == 1) {
+                    log.info("企业微信用户存在，并且已激活无需删除:{}:{}", wxEnterpriseId, userid);
+                    return;
+                }
+            }
             //删除
             TabHaobanStaff oldStaff = this.staffService.selectByUserIdAndEnterpriseId(userid, wxEnterpriseId);
             if (oldStaff == null) {