From 154b73d12f9e39039fc7b099beab3881c94b2d8d Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Thu, 21 Nov 2019 12:42:00 +0800
Subject: [PATCH] update：请求合并
---
src/main/resources/mapper/RoleMapper.xml | 20 +++++---------------
1 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/src/main/resources/mapper/RoleMapper.xml b/src/main/resources/mapper/RoleMapper.xml
index 95334fb..965ff3e 100644
--- a/src/main/resources/mapper/RoleMapper.xml
+++ b/src/main/resources/mapper/RoleMapper.xml
@@ -2,11 +2,10 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.moral.mapper.RoleMapper">
- <resultMap id="ResultMap" type="com.moral.entity.Role">
+ <resultMap id="BaseResultMap" type="com.moral.entity.Role">
<id column="id" property="id" jdbcType="INTEGER" />
<result column="role_code" property="roleCode" jdbcType="VARCHAR" />
<result column="role_name" property="roleName" jdbcType="VARCHAR" />
- <result column="channel_id" property="channelId" jdbcType="INTEGER" />
<result column="is_delete" property="isDelete" jdbcType="CHAR" />
<result column="role_remark" property="roleRemark" jdbcType="VARCHAR" />
<result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
@@ -15,15 +14,8 @@
<result column="update_user" property="updateUser" jdbcType="VARCHAR" />
</resultMap>
- <resultMap id="BaseResultMap" type="com.moral.entity.Role" 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="Base_Column_List" >
- id, role_code, role_name, channel_id, is_delete, role_remark, create_time, create_user,
+ id, role_code, role_name, is_delete, role_remark, create_time, create_user,
update_time, update_user
</sql>
@@ -57,7 +49,7 @@
</where>
</sql>
- <select id="getRoleListByName" resultMap="ResultMap">
+ <select id="getRoleListByName" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
from role
@@ -69,10 +61,8 @@
<select id="getRoleList" resultMap="BaseResultMap">
select
- r.*,
- c.channel_name
- from role r
- left join channel c on r.channel_id = c.id
+ <include refid="Base_Column_List"/>
+ from role
<if test="_parameter != null" >
<include refid="Example_Where_Clause" />
</if>
--
Gitblit v1.8.0