From 33e4dd1c5af5b8913ef94cb9bc7b94f2b62e373c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=85=B4=E7=90=B3?= <1911390090@qq.com>
Date: Wed, 5 Jun 2024 09:52:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=8F=9C=E5=8D=95=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6dc=E5=90=8E=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/common/core/domain/entity/SysMenu.java  | 11 +++++++++++
 .../resources/mapper/system/SysMenuMapper.xml     | 15 +++++++++++++--
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
index e07e6b94..9983ed1a 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
@@ -66,6 +66,17 @@ public class SysMenu extends BaseEntity
     /** 子菜单 */
     private List<SysMenu> children = new ArrayList<SysMenu>();
 
+    /**  菜单区分标识*/
+    private Long distinguish;
+
+    public Long getDistinguish() {
+        return distinguish;
+    }
+
+    public void setDistinguish(Long distinguish) {
+        this.distinguish = distinguish;
+    }
+
     public Long getMenuId()
     {
         return menuId;
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
index cdd15167..9f1d22b1 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
@@ -25,10 +25,12 @@
 		<result property="updateTime"     column="update_time"    />
 		<result property="updateBy"       column="update_by"      />
 		<result property="remark"         column="remark"         />
+		<result property="remark"         column="remark"         />
+		<result property="distinguish"         column="distinguish"         />
 	</resultMap>
 
 	<sql id="selectMenuVo">
-		select menu_id, menu_name, parent_id, order_num, path, component, `query`, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time
+		select distinguish, menu_id, menu_name, parent_id, order_num, path, component, `query`, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time
 		from sys_menu
 	</sql>
 
@@ -41,6 +43,9 @@
 			<if test="visible != null and visible != ''">
 				AND visible = #{visible}
 			</if>
+		 <if test="distinguish != null and distinguish != ''">
+				AND distinguish=#{distinguish}
+			</if>
 			<if test="status != null and status != ''">
 				AND status = #{status}
 			</if>
@@ -49,7 +54,7 @@
 	</select>
 
 	<select id="selectMenuTreeAll" resultMap="SysMenuResult">
-		select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
+		select distinct m.distinguish, m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
 		from sys_menu m where m.menu_type in ('M', 'C') and m.status = 0
 		order by m.parent_id, m.order_num
 	</select>
@@ -69,6 +74,9 @@
 		</if>
 		<if test="status != null and status != ''">
 			AND m.status = #{status}
+		</if>
+		  <if test="distinguish != null and distinguish != ''">
+			AND m.distinguish = #{distinguish}
 		</if>
 		order by m.parent_id, m.order_num
 	</select>
@@ -143,6 +151,7 @@
 			<if test="icon !=null and icon != ''">icon = #{icon},</if>
 			<if test="remark != null and remark != ''">remark = #{remark},</if>
 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+			<if test="distinguish != null and distinguish != ''">distinguish = #{distinguish},</if>
 			update_time = sysdate()
 		</set>
 		where menu_id = #{menuId}
@@ -166,6 +175,7 @@
 		<if test="icon != null and icon != ''">icon,</if>
 		<if test="remark != null and remark != ''">remark,</if>
 		<if test="createBy != null and createBy != ''">create_by,</if>
+		<if test="distinguish != null">distinguish,</if>
 		create_time
 		)values(
 		<if test="menuId != null and menuId != 0">#{menuId},</if>
@@ -184,6 +194,7 @@
 		<if test="icon != null and icon != ''">#{icon},</if>
 		<if test="remark != null and remark != ''">#{remark},</if>
 		<if test="createBy != null and createBy != ''">#{createBy},</if>
+		<if test="distinguish != null ">#{distinguish},</if>
 		sysdate()
 		)
 	</insert>