Merge branch 'feature-haoban-role' into developer

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

@@ -162,8 +162,11 @@ public class ClerkController extends WebBaseController {
         if (storeIds.contains("-1")) {
             storeIds = null;
         }
-        List<ClerkDTO> clerkDTOS = clerkService.listClerkByNameOrCode(enterpriseId, null, storeIds);
-
+        Page<ClerkDTO> clerkDTOPage = clerkService.pageClerkByNameOrCode(enterpriseId, null, storeIds, basePageInfo.getPageNum(), basePageInfo.getPageSize());
+        List<ClerkDTO> clerkDTOS = clerkDTOPage.getResult();
+        if (CollectionUtils.isEmpty(clerkDTOS)) {
+            return resultResponse(HaoBanErrCode.ERR_10016);
+        }
         Set<String> clerkCodeList = clerkDTOS.stream().map(ClerkDTO::getClerkCode).collect(Collectors.toSet());
         List<StaffClerkRelationDTO> bindRelationList = staffClerkRelationApiService.listBindCode(enterpriseId, clerkCodeList);
         Map<String, StaffClerkRelationDTO> bindCodeMap = bindRelationList.stream().collect(Collectors.toMap(StaffClerkRelationDTO::getClerkCode, s -> s));
@@ -972,7 +975,7 @@ public class ClerkController extends WebBaseController {
 
     //门店导购列表
     @RequestMapping("store-clerk-list")
-    public HaobanResponse storeClerkList(String storeId, String enterpriseId, Integer manageFlag, String clerkId) {
+    public HaobanResponse storeClerkList(String storeId, String enterpriseId, Integer manageFlag, String clerkId,BasePageInfo basePageInfo) {
         WellDoneLoginDTO loginUser = this.getLoginUser();
         String wxEnterpriseId = loginUser.getWxEnterpriseId();
         List<String> storeIds = new ArrayList<>();
@@ -988,7 +991,12 @@ public class ClerkController extends WebBaseController {
         if (storeIds.contains("-1")) {
             storeIds = null;
         }
-        List<ClerkDTO> list = clerkService.listClerkByNameOrCode(enterpriseId, null, storeIds);
+
+        Page<ClerkDTO> clerkDTOPage = clerkService.pageClerkByNameOrCode(enterpriseId, null, storeIds, basePageInfo.getPageNum(), basePageInfo.getPageSize());
+        List<ClerkDTO> list = clerkDTOPage.getResult();
+        if (CollectionUtils.isEmpty(list)) {
+            return resultResponse(HaoBanErrCode.ERR_10016);
+        }
         Set<String> clerkCodeList = list.stream().map(ClerkDTO::getClerkCode).collect(Collectors.toSet());
         List<StaffClerkRelationDTO> bindRelationList = staffClerkRelationApiService.listBindCode(enterpriseId, clerkCodeList);
         Map<String, StaffClerkRelationDTO> bindCodeMap = bindRelationList.stream().collect(Collectors.toMap(StaffClerkRelationDTO::getClerkCode, s -> s));