From 3219ee5eb2c7de1e1401bd94cb4dc4d37195b244 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 13 四月 2022 11:04:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xinghong-dev'
---
service-user/src/main/java/com/java110/user/cmd/menu/ListCatalogMenusCmd.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/menu/ListCatalogMenusCmd.java b/service-user/src/main/java/com/java110/user/cmd/menu/ListCatalogMenusCmd.java
index 7de8b3b..af28393 100644
--- a/service-user/src/main/java/com/java110/user/cmd/menu/ListCatalogMenusCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/menu/ListCatalogMenusCmd.java
@@ -32,7 +32,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import java.util.List;
@@ -65,7 +64,7 @@
Assert.hasKeyAndValue(reqJson, "userId", "鏈寘鍚敤鎴蜂俊鎭�");
Assert.hasKeyAndValue(reqJson, "storeId", "鏈寘鍚晢鎴蜂俊鎭�");
- Assert.hasKeyAndValue(reqJson, "caId", "鏈寘鍚洰褰曚俊鎭�");
+ //Assert.hasKeyAndValue(reqJson, "caId", "鏈寘鍚洰褰曚俊鎭�");
}
@Override
@@ -73,6 +72,7 @@
MenuGroupDto menuCatalogDto = BeanConvertUtil.covertBean(reqJson, MenuGroupDto.class);
menuCatalogDto.setGroupType(MenuGroupDto.GROUP_TYPE_PC);
+ //鍒ゆ柇鏄惁 涓� 寮�鍙戞垨鑰呰繍钀ワ紝濡傛灉鏄紑鍙戞垨鑰呰繍钀ユ椂 鍙栨秷 灏忓尯ID
//鏌ヨstore 淇℃伅
StoreDto storeDto = new StoreDto();
@@ -80,6 +80,10 @@
List<StoreDto> storeDtos = storeInnerServiceSMOImpl.getStores(storeDto);
Assert.listOnlyOne(storeDtos, "鍟嗘埛涓嶅瓨鍦�");
+
+ if (StoreDto.STORE_TYPE_ADMIN.equals(storeDtos.get(0).getStoreTypeCd()) || StoreDto.STORE_TYPE_DEV.equals(storeDtos.get(0).getStoreTypeCd())) {
+ menuCatalogDto.setCommunityId("");
+ }
menuCatalogDto.setDomain(storeDtos.get(0).getStoreTypeCd());
menuCatalogDto.setStoreType(storeDtos.get(0).getStoreTypeCd());
@@ -109,6 +113,7 @@
//鑾峰彇瀛╁瓙鑿滃崟
JSONArray childs = tempMenu.getJSONArray("childs");
JSONObject childMenu = new JSONObject();
+ childMenu.put("mId", tMenu.getString("mId"));
childMenu.put("name", tMenu.getString("menuName"));
childMenu.put("href", tMenu.getString("url"));
childMenu.put("seq", tMenu.getString("menuSeq"));
--
Gitblit v1.8.0