test

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

@@ -3,6 +3,7 @@ package com.gic.haoban.manage.service.service.out.impl;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -18,9 +19,6 @@ import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-
-import cn.hutool.core.convert.Convert;
-import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.clerk.api.dto.ClerkDTO;
@@ -54,6 +52,7 @@ import com.gic.haoban.manage.service.entity.TabHaobanDepartment;
 import com.gic.haoban.manage.service.entity.TabHaobanStaff;
 import com.gic.haoban.manage.service.entity.TabHaobanStaffDepartmentRelated;
 import com.gic.haoban.manage.service.entity.TabHaobanWxApplication;
+import com.gic.haoban.manage.service.entity.TabHaobanWxEnterprise;
 import com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseRelated;
 import com.gic.haoban.manage.service.service.DepartmentService;
 import com.gic.haoban.manage.service.service.MemberQueryService;
@@ -80,7 +79,7 @@ import com.gic.wechat.api.service.qywx.QywxSuiteApiService;
 import com.gic.wechat.api.service.qywx.QywxUserApiService;
 import com.google.common.collect.Sets;
 
-import java.util.*;
+import cn.hutool.core.convert.Convert;
 
 /**
  * 接收企业微信或者gic推送消息进行处理
@@ -237,12 +236,12 @@ public class MessageApiServiceImpl implements MessageApiService {
             return;
         }
         String corpId = qywxCallBackDTO.getAuthCorpId();
-        TabHaobanWxApplication wxApplication = wxApplicationService.selectByCorpId(corpId);
-        if (Objects.isNull(wxApplication)) {
+        TabHaobanWxEnterprise  wxEnterprise = this.wxEnterpriseService.getEnterpriseBycorpId(corpId);
+        if (Objects.isNull(wxEnterprise)) {
             log.info("授权企业不存在，{}", corpId);
             return;
         }
-        String wxEnterpriseId = wxApplication.getWxEnterpriseId();
+        String wxEnterpriseId = wxEnterprise.getWxEnterpriseId();
         String changeType = qywxCallBackDTO.getChangeType();
 
         if (changeType.equals(WxEditType.ADD_USER.getCode())) {