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
---
java110-db/src/main/resources/mapper/user/MenuCatalogV1ServiceDaoImplMapper.xml | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/user/MenuCatalogV1ServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/user/MenuCatalogV1ServiceDaoImplMapper.xml
index 2bda3c2..e594556 100644
--- a/java110-db/src/main/resources/mapper/user/MenuCatalogV1ServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/MenuCatalogV1ServiceDaoImplMapper.xml
@@ -124,11 +124,21 @@
mmg.`description` menuGroupDescription,mm.is_show isShow,mm.description
FROM m_menu mm
inner join m_menu_group mmg on mm.`g_id` = mmg.`g_id` AND mmg.`status_cd` = '0'
- inner join m_menu_group_catalog mgc on mmg.g_id = mgc.g_id and mgc.status_cd = '0'
+ <if test="caId !=null and caId != ''">
+ inner join m_menu_group_catalog mgc on mmg.g_id = mgc.g_id and mgc.status_cd = '0'
+ </if>
+ <if test="communityId !=null and communityId != ''">
+ inner join m_menu_group_community mgcy on mgcy.g_id = mmg.g_id and mgcy.status_cd = '0'
+ </if>
WHERE
- mmg.group_type = #{groupType}
+ mmg.group_type = #{groupType}
and mmg.store_type= #{domain}
- and mgc.ca_id = #{caId}
+ <if test="caId !=null and caId != ''">
+ and mgc.ca_id = #{caId}
+ </if>
+ <if test="communityId !=null and communityId != ''">
+ and mgcy.community_id = #{communityId}
+ </if>
AND mm.`status_cd` = '0'
AND mm.`m_id` IN (
SELECT pp.`m_id` FROM p_privilege_user ppu,p_privilege pp
--
Gitblit v1.8.0