Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer

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

@@ -162,8 +162,13 @@ public class ClerkApiServiceImpl implements ClerkApiService {
     @SuppressWarnings("unchecked")
     public ServiceResponse<Page<ClerkStoreListDTO>> listClerk(Integer enterpriseId, ClerkSearchDTO clerkSearchDTO,
             Integer pageNum, Integer pageSize) {
-        if (clerkSearchDTO.getStoreGroupId() == null) {
-            return ServiceResponse.failure(ErrorCode.MISS_PARAMETER.getCode(), ErrorCode.MISS_PARAMETER.getMsg());
+
+        boolean hasStoreIds = StringUtils.isNotBlank(clerkSearchDTO.getStoreIds());
+        //如果有门店数据条件，则不判断门店分组数据，因为分店分组数据也是为了获取门店
+        if (!hasStoreIds) {
+            if (clerkSearchDTO.getStoreGroupId() == null) {
+                return ServiceResponse.failure(ErrorCode.MISS_PARAMETER.getCode(), ErrorCode.MISS_PARAMETER.getMsg());
+            }
         }
         // 分组的id
         List<TabStoreGroup> groupList = storeGroupService.listStoreGroupAndChildren(clerkSearchDTO.getStoreGroupId());
@@ -181,7 +186,9 @@ public class ClerkApiServiceImpl implements ClerkApiService {
             storeIdByClerkSearch = "";
         }
         clerkSearchDTO.setEnterpriseId(enterpriseId);
-        clerkSearchDTO.setStoreIds(storeIdByClerkSearch);
+        if (!hasStoreIds) {
+            clerkSearchDTO.setStoreIds(storeIdByClerkSearch);
+        }
         ServiceResponse<Page<StoreDTO>> serviceResponse = listStoreIds(clerkSearchDTO, pageNum, pageSize);
         if (!serviceResponse.isSuccess()) {
             return ServiceResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());

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

@@ -489,7 +489,7 @@ public class StoreOpenApiServiceImpl implements StoreOpenApiService {
         }
         StringBuilder storeIds = new StringBuilder();
         if (StringUtils.isBlank(storeCode)) {
-            //查询域下所有的门店
+            //查询域下所有的门店:q
             StoreSearchDTO storeSearchDTO = new StoreSearchDTO();
             storeSearchDTO.setEnterpriseId(enterpriseId);
             storeSearchDTO.setRegionId(regionId);