导购交互优化

gic-store-web/src/main/java/com/gic/store/web/controller/ClerkController.java

@@ -85,6 +85,12 @@ public class ClerkController extends DownloadUtils {
     @RequestMapping("/export-clerk")
     public RestResponse exportClerk(HttpServletRequest request, @RequestBody ClerkSearchDTO clerkSearchDTO) {
         clerkSearchDTO.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
+        if (ClerkSearchTypeEnum.STORE.getType().equals(clerkSearchDTO.getSearchType())) {
+            // 如果是查询门店 查询参数其实是storeSearch
+            String search = clerkSearchDTO.getSearch();
+            clerkSearchDTO.setStoreSearch(search);
+            clerkSearchDTO.setSearch(null);
+        }
         ServiceResponse<Integer> totalClerkServiceResponse = clerkApiService.getTotalClerk(UserDetailUtils.getUserDetail().getEnterpriseId(), clerkSearchDTO);
         if (totalClerkServiceResponse.getResult() == 0) {
             return RestResponse.failure(ErrorCode.NOTEXISTS.getCode(), ErrorCode.NOTEXISTS.getMsg());
@@ -162,7 +168,12 @@ public class ClerkController extends DownloadUtils {
         if (CollectionUtils.isNotEmpty(list)) {
             clerkQrcodeQO.setContent(list.stream().filter(Objects::nonNull).collect(Collectors.toList()));
         }
-
+        if (ClerkSearchTypeEnum.STORE.getType().equals(clerkQrcodeQO.getClerkSearchDTO().getSearchType())) {
+            // 如果是查询门店 查询参数其实是storeSearch
+            String search = clerkQrcodeQO.getClerkSearchDTO().getSearch();
+            clerkQrcodeQO.getClerkSearchDTO().setStoreSearch(search);
+            clerkQrcodeQO.getClerkSearchDTO().setSearch(null);
+        }
         int total = 0;
         if(clerkQrcodeQO.getIsAll() == 1){
             ClerkSearchDTO clerkSearchDTO = clerkQrcodeQO.getClerkSearchDTO();