From 675ccd51874f9c005285eab3e4829e451848b4b6 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 07 六月 2023 11:11:29 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-user/src/main/java/com/java110/user/cmd/menu/ListCatalogCmd.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/menu/ListCatalogCmd.java b/service-user/src/main/java/com/java110/user/cmd/menu/ListCatalogCmd.java
index 164e609..3d5fdba 100644
--- a/service-user/src/main/java/com/java110/user/cmd/menu/ListCatalogCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/menu/ListCatalogCmd.java
@@ -18,10 +18,10 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.context.ICmdDataFlowContext;
-import com.java110.core.event.cmd.AbstractServiceCmdListener;
+import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.core.language.Language;
-import com.java110.dto.menuCatalog.MenuCatalogDto;
+import com.java110.dto.menu.MenuCatalogDto;
import com.java110.dto.store.StoreDto;
import com.java110.intf.store.IStoreInnerServiceSMO;
import com.java110.intf.user.IMenuCatalogV1InnerServiceSMO;
@@ -53,7 +53,7 @@
* // modify by 寮犱笁 at 2021-09-12 绗�10琛屽湪鏌愮鍦烘櫙涓嬪瓨鍦ㄦ煇绉峛ug 闇�瑕佷慨澶嶏紝娉ㄩ噴10鑷�20琛� 鍔犲叆 20琛岃嚦30琛�
*/
@Java110Cmd(serviceCode = "menu.listCatalog")
-public class ListCatalogCmd extends AbstractServiceCmdListener {
+public class ListCatalogCmd extends Cmd {
private static Logger logger = LoggerFactory.getLogger(ListCatalogCmd.class);
@Autowired
@@ -65,6 +65,9 @@
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
super.validatePageInfo(reqJson);
+ if(!reqJson.containsKey("storeId") || StringUtil.isEmpty(reqJson.getString("storeId"))){
+ reqJson.put("storeId",cmdDataFlowContext.getReqHeaders().get("store-id"));
+ }
}
@Override
@@ -92,7 +95,7 @@
}
String lang = cmdDataFlowContext.getReqHeaders().get(CommonConstant.JAVA110_LANG);
- if (!StringUtil.isEmpty(lang)) {
+ if (!StringUtil.isEmpty(lang) && !CommonConstant.LANG_ZH_CN.equals(lang)) {
Language language = ApplicationContextFactory.getBean(lang, Language.class);
if (language != null) {
menuCatalogDtos = language.getMenuCatalog(menuCatalogDtos);
--
Gitblit v1.8.0