门店查询

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

@@ -26,6 +26,7 @@ import com.gic.clerk.api.service.ClerkService;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.enterprise.api.dto.StoreDTO;
+import com.gic.enterprise.api.dto.StoreGroupDTO;
 import com.gic.enterprise.api.dto.StoreSearchDTO;
 import com.gic.enterprise.api.service.StoreGroupService;
 import com.gic.enterprise.api.service.StoreService;
@@ -88,11 +89,9 @@ public class HmStoreController {
         params.put("status", 2);
         if(StringUtils.isNotBlank(storeGroupId)) {
             boolean flag = true ;
-            List<String> rootGroup = this.storeGroupService.getStoreGroupIdsByParentId(enterpriseId, "0") ;
-            if(CollectionUtils.isNotEmpty(rootGroup)) {
-                logger.info("根节点={},{}",rootGroup,storeGroupId.contains(rootGroup.get(0)));
-                if(storeGroupId.contains(rootGroup.get(0))) {
-                    logger.info("所有门店");
+            if(!storeGroupId.contains(",")) {
+              StoreGroupDTO groupDTO = this.storeGroupService.getStoreGroupById(storeGroupId) ;
+                if(null != groupDTO && groupDTO.getParentGroupId().equals("0")) {
                     flag = false ;
                 }
             }