企微托管账号

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/WxEnterpriseMapper.java

@@ -95,5 +95,5 @@ public interface WxEnterpriseMapper {
      */
     List<String> listWxEnterpriseByCallbackFlag(@Param("callbackFlag")Integer callbackFlag);
 
-    String getWxEnterpriseIdByName(@Param("corpName")String corpName);
+    List<String> getWxEnterpriseIdByName(@Param("corpName")String corpName);
 }
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/WxEnterpriseService.java

@@ -104,6 +104,6 @@ public interface WxEnterpriseService {
 	 * @param corpName
 	 * @return
 	 */
-	String getWxEnterpriseIdByName(String corpName) ;
+	List<String> getWxEnterpriseIdByName(String corpName) ;
 
 }

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

@@ -318,7 +318,7 @@ public class WxEnterpriseServiceImpl implements WxEnterpriseService {
     }
 
     @Override
-    public String getWxEnterpriseIdByName(String corpName) {
+    public List<String> getWxEnterpriseIdByName(String corpName) {
         return this.mapper.getWxEnterpriseIdByName(corpName) ;
     }
 }

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

@@ -13,6 +13,7 @@ import com.gic.haoban.manage.service.service.OpenStaffService;
 import com.gic.haoban.manage.service.service.WxEnterpriseService;
 import com.gic.haoban.manage.service.util.OpenUtils;
 import com.gic.redis.data.util.RedisUtil;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -20,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 企微托管账号
@@ -62,8 +64,8 @@ public class OpenStaffApiServiceImpl implements OpenStaffApiService {
             return ServiceResponse.failure("9999","登录错误") ;
         }
         String wxEnterpriseId = openStaff.getWxEnterpriseId() ;
-        String backWxEnterpriseId = this.wxEnterpriseService.getWxEnterpriseIdByName(corpName) ;
-        if(StringUtils.isBlank(backWxEnterpriseId) || !backWxEnterpriseId.equals(wxEnterpriseId)) {
+        List<String> backWxEnterpriseIdList = this.wxEnterpriseService.getWxEnterpriseIdByName(corpName) ;
+        if(CollectionUtils.isNotEmpty(backWxEnterpriseIdList) || backWxEnterpriseIdList.size()>1 || !backWxEnterpriseIdList.get(0).equals(wxEnterpriseId)) {
             OpenUtils.logout(uuid);
             log.info("登录的企业不对={},{}",uuid,corpName);
             return ServiceResponse.failure("9999","登录错误") ;