From 576c52d8d8e6fb1e738380cc5fc101a6a2b0b3a8 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 04 九月 2021 16:00:57 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-db/src/main/resources/mapper/store/WechatMenuServiceDaoImplMapper.xml |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/store/WechatMenuServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/store/WechatMenuServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index ecba1bb..029c812
--- a/java110-db/src/main/resources/mapper/store/WechatMenuServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/store/WechatMenuServiceDaoImplMapper.xml
@@ -101,8 +101,9 @@
         select t.pagepath,t.app_id,t.app_id appId,t.menu_level,t.menu_level menuLevel,t.menu_name,t.menu_name
         menuName,t.menu_type,t.menu_type menuType,t.menu_value,t.menu_value menuValue,t.status_cd,t.status_cd
         statusCd,t.b_id,t.b_id bId,t.community_id,t.community_id communityId,t.wechat_menu_id,t.wechat_menu_id
-        wechatMenuId,t.parent_menu_id,t.parent_menu_id parentMenuId,t.seq
+        wechatMenuId,t.parent_menu_id,t.parent_menu_id parentMenuId,t.seq,d.name menuTypeName
         from wechat_menu t
+        left join t_dict d on t.menu_type = d.status_cd and d.table_name = 'wechat_menu' and d.table_columns = 'menu_type'
         where 1 =1
         <if test="pagepath !=null and pagepath != ''">
             and t.pagepath= #{pagepath}
@@ -196,6 +197,7 @@
     <select id="queryWechatMenusCount" parameterType="Map" resultType="Map">
         select count(1) count
         from wechat_menu t
+        left join t_dict d on t.menu_type = d.status_cd and d.table_name = 'wechat_menu' and d.table_columns = 'menu_type'
         where 1 =1
         <if test="pagepath !=null and pagepath != ''">
             and t.pagepath= #{pagepath}

--
Gitblit v1.8.0