Merge remote-tracking branch 'origin/developer' into developer

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

@@ -50,7 +50,7 @@ public class HmStoreController {
         params.put("status", 2);
         params.put("storeGroupId", storeGroupId);
         // 是否显示子分组(1显示,其余不显示)
-        params.put("showChildren", 0);
+        params.put("showChildren", 1);
         // 只获取导购和店长
         params.put("clerkTypeList", Arrays.asList(1, 0));
         if (StringUtils.isNotBlank(storeSearchParams)) {
@@ -59,9 +59,6 @@ public class HmStoreController {
         if (StringUtils.isNotBlank(clerkSearchParams)) {
             params.put("clerkSearchParams", "%" + clerkSearchParams + "%");
         }
-        if (StringUtils.isBlank(storeGroupId)) {
-            return RestResponse.failure("-1", "门店分组ID不能为空");
-        }
         // 如果有权限控制,进行管辖门店过0滤
         List<String> authStoreIdList = this.staffApiService.getHaoBanStoreIdsRolesByClerkId(loginUser.getClerkId(),
                 loginUser.getWxEnterpriseId());