门店分组

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

@@ -27,6 +27,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;
@@ -87,15 +88,20 @@ public class HmStoreController {
         params.put("enterpriseId", enterpriseId);
         // 2线上
         params.put("status", 2);
-        if(StringUtils.isNotBlank(storeGroupId) && storeGroupId.contains(",")) {
-            List<String> storeGroupIds = Arrays.asList(storeGroupId.split(",")) ;
-            List<String> groupIds = storeGroupService.getStoreGroupIdsByParentGroupId(enterpriseId, storeGroupIds);
-            logger.info("分组的数量={}",groupIds.size());
-            params.put("storeGroupIdList", groupIds);
-        }else {
-            params.put("storeGroupId", storeGroupId);
-            // 是否显示子分组(1显示,其余不显示)
-            params.put("showChildren", 1);
+        if(StringUtils.isNotBlank(storeGroupId)) {
+            boolean flag = true ;
+            if(!storeGroupId.contains(",")) {
+                StoreGroupDTO groupDTO = this.storeGroupService.getStoreGroupById(storeGroupId) ;
+                if(null != groupDTO && groupDTO.getParentGroupId().equals("0")) {
+                    flag = false ;
+                }
+            }
+            if(flag) {
+                List<String> storeGroupIds = Arrays.asList(storeGroupId.split(",")) ;
+                List<String> groupIds = storeGroupService.getStoreGroupIdsByParentGroupId(enterpriseId, storeGroupIds);
+                logger.info("分组的数量={}",groupIds.size());
+                params.put("storeGroupIdList", groupIds);
+            }
         }
         // 只获取导购和店长
         params.put("clerkTypeList", Arrays.asList(1, 0));