fix：更改查询导购过滤超管

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

@@ -2,7 +2,6 @@ package com.gic.haoban.manage.web.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.Page;
 import com.gic.clerk.api.dto.ClerkDTO;
@@ -369,7 +368,7 @@ public class StaffController extends WebBaseController {
             logger.info("没有权限门店");
             return resultResponse(HaoBanErrCode.ERR_1);
         }
-        List<ClerkDTO> clerkDTOList = clerkNewService.listClerkByEnterpriseIdAndSearch(enterpriseIds, storeIds, search);
+        List<ClerkDTO> clerkDTOList = clerkNewService.listClerkByEnterpriseIdAndSearchAndClerkType(enterpriseIds, storeIds, search);
         List<ClerkInfoVo> retList = EntityUtil.changeEntityListByJSON(ClerkInfoVo.class, clerkDTOList);
         if (CollectionUtils.isNotEmpty(retList)) {
             logger.info("导购数量={}",retList.size());

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

@@ -669,7 +669,7 @@ public class ClerkController extends WebBaseController {
             return !over;
         }).map(EnterpriseDetailDTO::getEnterpriseId).collect(Collectors.toList());
         List<String> storeIds = wxEnterpriseRelatedApiService.listStoreIdByWxEnterpriseId(wxEnterpriseId);
-        List<ClerkDTO> clerkList = clerkNewService.listClerkByEnterpriseIdAndSearch(enterpriseIdList, storeIds, keyword);
+        List<ClerkDTO> clerkList = clerkNewService.listClerkByEnterpriseIdAndSearchAndClerkType(enterpriseIdList, storeIds, keyword);
         List<ClerkStoreVO> clerkStoreList = buildClerkRelation(clerkList, enterpriseIdList);
         return resultResponse(HaoBanErrCode.ERR_1, clerkStoreList);
     }
@@ -764,7 +764,7 @@ public class ClerkController extends WebBaseController {
                 logger.error("手机号为空，staffId：{}", staffId);
                 return ret;
             }
-            List<ClerkDTO> clerkList = clerkNewService.listClerkByEnterpriseIdAndSearch(enterpriseIdList, storeIdList, phoneNumber);
+            List<ClerkDTO> clerkList = clerkNewService.listClerkByEnterpriseIdAndSearchAndClerkType(enterpriseIdList, storeIdList, phoneNumber);
             if (CollectionUtils.isNotEmpty(clerkList)) {
                 ret.addAll(clerkList);
             }
@@ -781,7 +781,7 @@ public class ClerkController extends WebBaseController {
             if (StringUtils.isEmpty(clerkDTO.getPhoneNumber())) {
                 continue;
             }
-            List<ClerkDTO> clerkList = clerkNewService.listClerkByEnterpriseIdAndSearch(enterpriseIdList, storeIdList, clerkDTO.getPhoneNumber());
+            List<ClerkDTO> clerkList = clerkNewService.listClerkByEnterpriseIdAndSearchAndClerkType(enterpriseIdList, storeIdList, clerkDTO.getPhoneNumber());
             if (CollectionUtils.isNotEmpty(clerkList)) {
                 ret.addAll(clerkList);
             }