From 68294b3a156d2c0573c04f1ac43940a55e397269 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 15 Sep 2020 15:38:02 +0800
Subject: [PATCH] 登陆接口测试

---
 src/main/resources/mapper/MenuMapper.xml |   50 +++++++++++++++++++++++++++++++++++---------------
 1 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/src/main/resources/mapper/MenuMapper.xml b/src/main/resources/mapper/MenuMapper.xml
index 4674c35..79a4df8 100644
--- a/src/main/resources/mapper/MenuMapper.xml
+++ b/src/main/resources/mapper/MenuMapper.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.moral.mapper.MenuMapper">
-    <resultMap id="BaseResultMap" type="com.moral.entity.Menu">
+    <resultMap id="ResultMap" type="com.moral.entity.Menu">
         <id column="id" property="id" jdbcType="INTEGER"/>
         <result column="menu_code" property="menuCode" jdbcType="VARCHAR"/>
         <result column="menu_name" property="menuName" jdbcType="VARCHAR"/>
+        <result column="channel_id" property="channelId" jdbcType="INTEGER" />
         <result column="menu_icon" property="menuIcon" jdbcType="VARCHAR"/>
         <result column="menu_url" property="menuUrl" jdbcType="VARCHAR"/>
         <result column="menu_order" property="menuOrder" jdbcType="INTEGER"/>
@@ -15,6 +16,13 @@
         <result column="create_user" property="createUser" jdbcType="VARCHAR"/>
         <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
         <result column="update_user" property="updateUser" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <resultMap id="BaseResultMap" type="com.moral.entity.Menu" extends="ResultMap">
+        <association property="channel" javaType="com.moral.entity.Channel">
+            <result column="channel_id" jdbcType="INTEGER" property="id" />
+            <result column="channel_name" jdbcType="VARCHAR" property="channelName" />
+        </association>
     </resultMap>
 
     <sql id="Example_Where_Clause">
@@ -48,13 +56,20 @@
         </where>
     </sql>
 
-    <select id="selectWithMenuNameByExample" parameterType="tk.mybatis.mapper.entity.Example" resultMap="BaseResultMap">
+    <select id="countByExample" parameterType="tk.mybatis.mapper.entity.Example" resultType="java.lang.Integer" >
+        select count(*) from menu m
+        <if test="_parameter != null" >
+            <include refid="Example_Where_Clause" />
+        </if>
+    </select>
+
+    <select id="selectWithMenuNameByExample" parameterType="tk.mybatis.mapper.entity.Example" resultMap="ResultMap">
         select
         <if test="distinct">
             distinct
         </if>
         <include refid="Base_Column_List"/>
-        from menu
+        from menu m
         <if test="_parameter != null">
             <include refid="Example_Where_Clause"/>
         </if>
@@ -65,11 +80,10 @@
 
     <select id="getMenuList" resultMap="BaseResultMap" parameterType="tk.mybatis.mapper.entity.Example">
         select
-        <if test="distinct">
-            distinct
-        </if>
-        <include refid="Base_Column_List"/>
-        from menu
+        m.*,
+        c.channel_name
+        from menu m
+        left join channel c on m.channel_id = c.id
         <if test="_parameter != null">
             <include refid="Example_Where_Clause"/>
         </if>
@@ -79,30 +93,36 @@
     </select>
 
     <sql id="Base_Column_List">
-        id, menu_code, menu_name, menu_icon, menu_url, menu_order, menu_parent_id, menu_remark,
+        id, menu_code, menu_name, channel_id, menu_icon, menu_url, menu_order, menu_parent_id, menu_remark,
         is_delete, create_time, create_user, update_time, update_user
     </sql>
 
-    <select id="getParentMenuList" resultMap="BaseResultMap">
+    <select id="getParentMenuList" resultMap="ResultMap">
         select
         distinct
         <include refid="Base_Column_List"/>
         from menu
         where id IN
         (select distinct(menu_parent_Id) from menu
-        where menu_parent_Id is not null)
+        where menu_parent_Id <![CDATA[ <> ]]> 0)
         <if test="menuName != 'null'">
             and menu_name like concat('%',#{menuName},'%')
         </if>
     </select>
 
-    <select id="getMenuListByName" resultMap="BaseResultMap">
+    <select id="getMenuListInfo" resultMap="ResultMap">
         select
         <include refid="Base_Column_List"/>
         from menu
         where is_delete=0
-        <if test="menuName != 'null'">
-            and menu_name like concat('%',#{menuName},'%')
-        </if>
     </select>
+
+    <select id="getMenuOrdersByRoleId" resultType="java.lang.Integer">
+        select
+        m.menu_order
+        from menu m
+        left join role_menu rm on m.id=rm.menu_id and m.channel_id= rm.channel_id
+        where rm.role_id = #{roleId}
+    </select>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0