From 3df4f24049c8b3e4c36fde16a67a436ce37f00ad Mon Sep 17 00:00:00 2001
From: JinPengYong <812110275@qq.com>
Date: Sun, 26 Apr 2020 16:18:30 +0800
Subject: [PATCH] Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.
---
src/main/resources/mapper/RoleMapper.xml | 44 --------------------------------------------
1 files changed, 0 insertions(+), 44 deletions(-)
diff --git a/src/main/resources/mapper/RoleMapper.xml b/src/main/resources/mapper/RoleMapper.xml
index 965ff3e..041054a 100644
--- a/src/main/resources/mapper/RoleMapper.xml
+++ b/src/main/resources/mapper/RoleMapper.xml
@@ -49,16 +49,6 @@
</where>
</sql>
- <select id="getRoleListByName" resultMap="BaseResultMap">
- select
- <include refid="Base_Column_List"/>
- from role
- where is_delete=0
- <if test="roleName != 'null'">
- and role_name like concat('%',#{roleName},'%')
- </if>
- </select>
-
<select id="getRoleList" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
@@ -70,39 +60,5 @@
order by ${orderByClause}
</if>
</select>
-
- <update id="updateByPrimaryKey" parameterType="com.moral.entity.Role" >
- update role
- <set >
- <if test="roleCode != null" >
- role_code = #{roleCode,jdbcType=VARCHAR},
- </if>
- <if test="roleName != null" >
- role_name = #{roleName,jdbcType=VARCHAR},
- </if>
- <if test="channelId != null" >
- channel_id = #{channelId,jdbcType=INTEGER},
- </if>
- <if test="isDelete != null" >
- is_delete = #{isDelete,jdbcType=CHAR},
- </if>
- <if test="roleRemark != null" >
- role_remark = #{roleRemark,jdbcType=VARCHAR},
- </if>
- <if test="createTime != null" >
- create_time = #{createTime,jdbcType=TIMESTAMP},
- </if>
- <if test="createUser != null" >
- create_user = #{createUser,jdbcType=VARCHAR},
- </if>
- <if test="updateTime != null" >
- update_time = #{updateTime,jdbcType=TIMESTAMP},
- </if>
- <if test="updateUser != null" >
- update_user = #{updateUser,jdbcType=VARCHAR},
- </if>
- </set>
- where id = #{id,jdbcType=INTEGER}
- </update>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0