登录

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

@@ -500,7 +500,7 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi
     public List<WxEnterpriseDTO> listWxEnterpriseByEid(String enterpriseId, String clerkPhoneNumber) {
         List<WxEnterpriseDTO>  list = new ArrayList<>();
         ClerkDTO clerk = this.clerkService.getUserByPhoneNumber(clerkPhoneNumber, enterpriseId);
-        if(null == clerk || StringUtils.isBlank(clerk.getHbEnt())) {
+        if(null == clerk || (StringUtils.isBlank(clerk.getHbEnt()) && null != clerk.getSuperAdmin() && 0==clerk.getSuperAdmin())) {
             return  list ;
         }
         List<WxEnterpriseDTO>  dtoList  =  this.listWxEnterpriseByEid(enterpriseId) ;

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/LoginController.java

@@ -362,7 +362,7 @@ public class LoginController extends WebBaseController {
         String wxEnterpriseId = jsonObject.getString("wxEnterpriseId");
         List<WxEnterpriseDTO> enterpriseDTOList = wxEnterpriseRelatedApiService.listWxEnterpriseByEid(gicEnterpriseId,phoneNumber);
         if (CollectionUtils.isEmpty(enterpriseDTOList)) {
-            logger.info("登录失败，不存在对应企业:{}", o);
+            logger.info("登录失败,查询微信企业列表空", o);
             return resultResponse(HaoBanErrCode.ERR_6);
         }
         if (StringUtils.isNotBlank(wxEnterpriseId)) {