登录

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

@@ -21,6 +21,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.alibaba.fastjson.JSONObject;
@@ -47,6 +48,7 @@ import com.gic.haoban.common.utils.UuidUtil;
 import com.gic.haoban.manage.api.dto.BindStoreInfoDTO;
 import com.gic.haoban.manage.api.dto.DepartmentDTO;
 import com.gic.haoban.manage.api.dto.EnterpriseDetailDTO;
+import com.gic.haoban.manage.api.dto.HaobanUserDTO;
 import com.gic.haoban.manage.api.dto.StoreOrGroupInfoDTO;
 import com.gic.haoban.manage.api.dto.StoreRangeInfoDTO;
 import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
@@ -601,4 +603,11 @@ public class EnterpriseController extends WebBaseController {
         return resultResponse(HaoBanErrCode.ERR_1);
     }
     
+    //授权企业列表 filteRight 是否过滤无登录权限的列表
+    @RequestMapping("gic-enterprise-list")
+    public HaobanResponse wxaEnterpriseList(String  wxEnterpriseId) {
+        List<EnterpriseDetailDTO> list = wxEnterpriseRelatedApiService.listEnterpriseByWxEnterpriseId(wxEnterpriseId,null,false);
+        return resultResponse(HaoBanErrCode.ERR_1, list);
+    }
+    
 }

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

@@ -64,6 +64,9 @@ public class AdminController extends WebBaseController {
         List<AdminVO> resultList = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(openUserIds)) {
             String staffId = login.getStaffId() ;
+            if(StringUtils.isBlank(staffId)) {
+                return this.resultResponse(HaoBanErrCode.ERR_10030) ;
+            }
             if (corpid.length() > 20) {
                 list = staffApiService.listByOpenUserIdsAndWxEnterpriseId(openUserIds, wxEnterpriseId);
             } else {