导购查

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

@@ -32,7 +32,6 @@ import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.clerk.api.dto.ClerkDTO;
 import com.gic.clerk.api.dto.ClerkListDTO;
-import com.gic.clerk.api.dto.ClerkStoreListDTO;
 import com.gic.clerk.api.service.ClerkNewService;
 import com.gic.clerk.api.service.ClerkService;
 import com.gic.clerk.api.service.PowerService;
@@ -45,7 +44,6 @@ import com.gic.enterprise.api.dto.StoreSearchDTO;
 import com.gic.enterprise.api.service.EnterpriseService;
 import com.gic.enterprise.api.service.StoreService;
 import com.gic.enterprise.api.service.StoreWidgetService;
-import com.gic.haoban.app.customer.dto.ChildrenListDTO;
 import com.gic.haoban.app.customer.service.api.service.CustomerApiService;
 import com.gic.haoban.app.customer.service.api.service.DistributeApiService;
 import com.gic.haoban.base.api.common.BasePageInfo;
@@ -1738,28 +1736,16 @@ public class WxStaffController extends WebBaseController {
             }
             resultList = EntityUtil.changeEntityListByJSON(ClerkListVO.class, clerkList);
         }else if(clerkType==2) {
-            Map<String, Object> params = new HashMap<>();
-            params.put("enterpriseId", enterpriseId);
-            // 只获取导购和店长
-            params.put("clerkTypeList", Arrays.asList(1));
-            if (StringUtils.isNotBlank(clerkSearchParams)) {
-                params.put("clerkSearchParams", "%" + clerkSearchParams + "%");
-            }
             // 如果有权限控制,进行管辖门店过0滤
             List<String> authStoreIdList = this.staffApiService.getHaoBanStoreIdsRolesByClerkId(clerkId,wxEnterpriseId);
             if (CollectionUtils.isEmpty(authStoreIdList)) {
                 return RestResponse.failure("-1", "无授权门店");
             }
-            if (!(authStoreIdList.size() == 1 && authStoreIdList.contains("-1"))) {
-                params.put("storeIdList", authStoreIdList);
+            if (authStoreIdList.size() == 1 && authStoreIdList.contains("-1")) {
+                authStoreIdList = null ;
             }
-            Page<ClerkStoreListDTO> page = new Page<>();
-            page.setPageSize(basePageInfo.getPageSize());
-            page.setCurrentPage(basePageInfo.getPageNum());
-            page.setParams(params);
-            logger.info("查询条件:{}", JSON.toJSONString(params));
-            page = this.clerkService.listStoreClerkByPage(page);
-            resultList = EntityUtil.changeEntityListByJSON(ClerkListVO.class, page.getResult());
+            // 查询区经门店下的店长,eid,storelist,clerkSearchParams
+            logger.info("查询所有店长,返回={}", enterpriseId);
         }
         List<String> clerkIdList = resultList.stream().map(dto->dto.getClerkId()).collect(Collectors.toList()) ;
         List<StaffClerkRelationDTO>  relationList = this.staffClerkRelationApiService.listByClerkIdsWxEnterpriseId(clerkIdList, wxEnterpriseId) ;