门店添加筛选

gic-store-api/src/main/java/com/gic/store/dto/ClerkSearchDTO.java

@@ -20,6 +20,7 @@ public class ClerkSearchDTO implements Serializable {
     private Integer currentPage=1;
     private Integer pageSize=20;
     private Integer clerkType;
+    private String storeSearch;
 
     private String fileName;
     private Integer excelExtension;
@@ -130,4 +131,12 @@ public class ClerkSearchDTO implements Serializable {
     public void setStoreInfoIds(String storeInfoIds) {
         this.storeInfoIds = storeInfoIds;
     }
+
+    public String getStoreSearch() {
+        return storeSearch;
+    }
+
+    public void setStoreSearch(String storeSearch) {
+        this.storeSearch = storeSearch;
+    }
 }

gic-store-service/src/main/java/com/gic/store/service/outer/impl/ClerkApiServiceImpl.java

@@ -22,7 +22,6 @@ import com.gic.store.dto.clerk.OrderAddClerkDTO;
 import com.gic.store.dto.clerk.PosAddClerkDTO;
 import com.gic.store.dto.clerk.ProcessBatchClerkDTO;
 import com.gic.store.entity.TabClerk;
-import com.gic.store.entity.TabStoreGroup;
 import com.gic.store.entity.TabStoreRegion;
 import com.gic.store.service.*;
 import com.gic.weimob.api.dto.WeimobGuiderSynDTO;
@@ -307,6 +306,8 @@ public class ClerkApiServiceImpl implements ClerkApiService {
             if (CollectionUtils.isNotEmpty(storeInfoIdsBySearch)) {
                 String storeInfoIds = storeInfoIdsBySearch.stream().map(Object::toString).collect(Collectors.joining(" "));
                 clerkSearchDTO.setStoreInfoIds(storeInfoIds);
+            } else {
+                return ServiceResponse.success();
             }
         }
 
@@ -366,6 +367,8 @@ public class ClerkApiServiceImpl implements ClerkApiService {
             if (CollectionUtils.isNotEmpty(storeInfoIdsBySearch)) {
                 String storeInfoIds = storeInfoIdsBySearch.stream().map(Object::toString).collect(Collectors.joining(" "));
                 clerkSearchDTO.setStoreInfoIds(storeInfoIds);
+            } else {
+                return ServiceResponse.success();
             }
         }
 
@@ -415,6 +418,7 @@ public class ClerkApiServiceImpl implements ClerkApiService {
         storeSearchDTO.setStoreGroupId(clerkSearchDTO.getStoreGroupId());
         storeSearchDTO.setSearchJson(clerkSearchDTO.getSearchJson());
         storeSearchDTO.setStoreIds(clerkSearchDTO.getStoreIds());
+        storeSearchDTO.setSearch(clerkSearchDTO.getStoreSearch());
         storeSearchDTO.setStoreInfoIds(clerkSearchDTO.getStoreInfoIds());
 
         return storeApiService.listStore(storeSearchDTO, pageNum, pageSize,