From d7d9b601b2e4fdb663375993e2cfbdbd363df421 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 11 七月 2023 22:17:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-user/src/main/java/com/java110/user/cmd/menu/ListCatalogMenusCmd.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 ca67f80..b639241 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
@@ -19,10 +19,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.menuGroup.MenuGroupDto;
+import com.java110.dto.menu.MenuGroupDto;
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.listCatalogMenus")
-public class ListCatalogMenusCmd extends AbstractServiceCmdListener {
+public class ListCatalogMenusCmd extends Cmd {
private static Logger logger = LoggerFactory.getLogger(ListCatalogMenusCmd.class);
@Autowired
@@ -94,7 +94,7 @@
List<Map> menus = menuCatalogV1InnerServiceSMOImpl.queryMenus(menuCatalogDto);
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) {
menus = language.getMenuDto(menus);
--
Gitblit v1.8.0