From f0376f72170c2eb236bec5560b8c5734edd222f1 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 31 Mar 2021 17:16:40 +0800
Subject: [PATCH] common模块： 增加了convert工具类，驼峰和下划线相互转换 更新了Date工具类，添加根据Date，day获取目标date的方法 更新WebUtils工具类，添加获取请求Ip方法 manage模块： 组织和后台用户增删改查模块全部完成 增加aop用作日志插入
---
screen-api/src/main/resources/mapper/MenuMapper.xml | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/MenuMapper.xml b/screen-api/src/main/resources/mapper/MenuMapper.xml
index 8ae2d80..261a915 100644
--- a/screen-api/src/main/resources/mapper/MenuMapper.xml
+++ b/screen-api/src/main/resources/mapper/MenuMapper.xml
@@ -32,6 +32,19 @@
AND gm.menu_id = m.id
AND ug.is_delete = 0
AND gm.is_delete = 0
+ AND gm.channel = 1
+ AND m.is_delete = 0
+ ORDER by m.`order`
+ </select>
+
+ <select id="selectOrganizationMenu" resultMap="MenuResultMap">
+ SELECT m.id,m.name,m.url,m.icon,m.parent_id,m.order
+ FROM `menu` m, `organization_menu` om
+ WHERE om.organization_id = #{orgId}
+ AND m.id = om.menu_id
+ AND om.channel = 1
+ AND om.menu_id = m.id
+ AND om.is_delete = 0
AND m.is_delete = 0
ORDER by m.`order`
</select>
--
Gitblit v1.8.0