From f342a0d88b2a7168f794d0cf545d16a3138acb6d Mon Sep 17 00:00:00 2001
From: wuqiping <wuqiping@qq.com>
Date: Wed, 09 Jun 2021 15:55:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-manage/src/main/resources/mapper/ManageRoleMapper.xml | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/screen-manage/src/main/resources/mapper/ManageRoleMapper.xml b/screen-manage/src/main/resources/mapper/ManageRoleMapper.xml
index 8e3e2a3..b7521d2 100644
--- a/screen-manage/src/main/resources/mapper/ManageRoleMapper.xml
+++ b/screen-manage/src/main/resources/mapper/ManageRoleMapper.xml
@@ -30,26 +30,34 @@
</select>
<select id="getAll" resultMap="BaseResultMap">
- select * from manage_role
- where is_delete = 0
+ select
+ <include refid="Base_Column_List"></include>
+ from manage_role mr
+ where mr.is_delete = 0
</select>
<select id="getManageRoleByName" resultMap="BaseResultMap">
- select * from manage_role
+ select
+ <include refid="Base_Column_List"></include>
+ from manage_role mr
where name = #{name}
- and is_delete = 0
+ and mr.is_delete = 0
</select>
<select id="getManageRoleById" resultMap="BaseResultMap">
- select * from manage_role
- where id = #{id}
- and is_delete = 0
+ select
+ <include refid="Base_Column_List"></include>
+ from manage_role mr
+ where mr.id = #{id}
+ and mr.is_delete = 0
</select>
<select id="getManageRoleByNameFuzzy" resultMap="BaseResultMap">
- select * from manage_role
- where name like concat('%',#{name},'%')
- and is_delete = 0
+ select
+ <include refid="Base_Column_List"></include>
+ from manage_role mr
+ where mr.name like concat('%',#{name},'%')
+ and mr.is_delete = 0
</select>
<insert id="insertOne" parameterType="com.moral.api.entity.ManageRole">
--
Gitblit v1.8.0