From 75f043dfa6660716364e66ee0b3cf99f44255686 Mon Sep 17 00:00:00 2001
From: DYL0109 <dn18191638832@163.com>
Date: 星期三, 16 四月 2025 19:20:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop1.0' into dyl_dev
---
zhitan-system/src/main/resources/mapper/system/SysRoleMapper.xml | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/zhitan-system/src/main/resources/mapper/system/SysRoleMapper.xml b/zhitan-system/src/main/resources/mapper/system/SysRoleMapper.xml
index 8196b75..caf1e1f 100644
--- a/zhitan-system/src/main/resources/mapper/system/SysRoleMapper.xml
+++ b/zhitan-system/src/main/resources/mapper/system/SysRoleMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhitan.system.mapper.SysRoleMapper">
- <resultMap type="SysRole" id="SysRoleResult">
+ <resultMap type="com.zhitan.common.core.domain.entity.SysRole" id="SysRoleResult">
<id property="roleId" column="role_id" />
<result property="roleName" column="role_name" />
<result property="roleKey" column="role_key" />
@@ -30,7 +30,7 @@
left join sys_dept d on u.dept_id = d.dept_id
</sql>
- <select id="selectRoleList" parameterType="SysRole" resultMap="SysRoleResult">
+ <select id="selectRoleList" parameterType="com.zhitan.common.core.domain.entity.SysRole" resultMap="SysRoleResult">
<include refid="selectRoleVo"/>
where r.del_flag = '0'
<if test="roleId != null and roleId != 0">
@@ -94,7 +94,7 @@
where r.role_key=#{roleKey} and r.del_flag = '0' limit 1
</select>
- <insert id="insertRole" parameterType="SysRole" useGeneratedKeys="true" keyProperty="roleId">
+ <insert id="insertRole" parameterType="com.zhitan.common.core.domain.entity.SysRole" useGeneratedKeys="true" keyProperty="roleId">
insert into sys_role(
<if test="roleId != null and roleId != 0">role_id,</if>
<if test="roleName != null and roleName != ''">role_name,</if>
@@ -122,7 +122,7 @@
)
</insert>
- <update id="updateRole" parameterType="SysRole">
+ <update id="updateRole" parameterType="com.zhitan.common.core.domain.entity.SysRole">
update sys_role
<set>
<if test="roleName != null and roleName != ''">role_name = #{roleName},</if>
@@ -139,7 +139,7 @@
where role_id = #{roleId}
</update>
- <update id="updateRoleStatus" parameterType="SysRole">
+ <update id="updateRoleStatus" parameterType="com.zhitan.common.core.domain.entity.SysRole">
update sys_user set status = #{status} where user_id = #{userId}
</update>
--
Gitblit v1.9.3