From 17d054803583cd870dc15dc16551563ff619c658 Mon Sep 17 00:00:00 2001
From: jpy <812110275@qq.com>
Date: Sat, 27 May 2023 16:12:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-manage/src/main/resources/mapper/ManageRoleMapper.xml | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/screen-manage/src/main/resources/mapper/ManageRoleMapper.xml b/screen-manage/src/main/resources/mapper/ManageRoleMapper.xml
index b7521d2..6e7155a 100644
--- a/screen-manage/src/main/resources/mapper/ManageRoleMapper.xml
+++ b/screen-manage/src/main/resources/mapper/ManageRoleMapper.xml
@@ -22,18 +22,18 @@
FROM
manage_role mr
JOIN manage_account_role mar
- ON mar.role_id=mr.id AND mar.is_delete = 0
+ ON mar.role_id=mr.id AND mar.is_delete = '0'
JOIN manage_account ma
ON ma.id=mar.account_id and ma.id = #{accountId}
where
- mr.is_delete=0
+ mr.is_delete='0'
</select>
<select id="getAll" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"></include>
from manage_role mr
- where mr.is_delete = 0
+ where mr.is_delete = '0'
</select>
<select id="getManageRoleByName" resultMap="BaseResultMap">
@@ -41,7 +41,7 @@
<include refid="Base_Column_List"></include>
from manage_role mr
where name = #{name}
- and mr.is_delete = 0
+ and mr.is_delete = '0'
</select>
<select id="getManageRoleById" resultMap="BaseResultMap">
@@ -49,7 +49,7 @@
<include refid="Base_Column_List"></include>
from manage_role mr
where mr.id = #{id}
- and mr.is_delete = 0
+ and mr.is_delete = '0'
</select>
<select id="getManageRoleByNameFuzzy" resultMap="BaseResultMap">
@@ -57,7 +57,7 @@
<include refid="Base_Column_List"></include>
from manage_role mr
where mr.name like concat('%',#{name},'%')
- and mr.is_delete = 0
+ and mr.is_delete = '0'
</select>
<insert id="insertOne" parameterType="com.moral.api.entity.ManageRole">
--
Gitblit v1.8.0