From d7efbb2b6bae17334c3f8dbdb706813e1ad738b5 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 06 十二月 2024 11:26:19 +0800
Subject: [PATCH] 修改
---
ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml | 8 +-
ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml | 10 +-
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 22 +++---
ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml | 6 +-
ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml | 2
ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml | 4
ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml | 2
ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml | 8 +-
ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml | 8 +-
ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml | 6 +-
ruoyi-admin/src/main/resources/application-druid.yml | 10 +-
ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml | 2
ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml | 10 +-
ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml | 12 ++--
ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml | 10 +-
ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml | 8 +-
16 files changed, 64 insertions(+), 64 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index bcffb58..b896c0f 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -6,12 +6,12 @@
druid:
# 主库数据源
master:
- url: jdbc:mysql://127.0.0.1:10633/cashier?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: ShouYin@2024!
-# url: jdbc:mysql://127.0.0.1:3306/cashier?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
+# url: jdbc:mysql://127.0.0.1:10633/cashier?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# username: root
-# password: 123456
+# password: ShouYin@2024!
+ url: jdbc:mysql://127.0.0.1:3306/cashier?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=GMT%2B8
+ username: root
+ password: 123456
# 从库数据源
slave:
# 从数据源开关/默认关闭
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
index ca39f47..dc2e7cf 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysConfigMapper">
- <resultMap type="SysConfig" id="SysConfigResult">
+ <resultMap type="com.ruoyi.system.domain.SysConfig" id="SysConfigResult">
<id property="configId" column="config_id" />
<result property="configName" column="config_name" />
<result property="configKey" column="config_key" />
@@ -33,12 +33,12 @@
</where>
</sql>
- <select id="selectConfig" parameterType="SysConfig" resultMap="SysConfigResult">
+ <select id="selectConfig" parameterType="com.ruoyi.system.domain.SysConfig" resultMap="SysConfigResult">
<include refid="selectConfigVo"/>
<include refid="sqlwhereSearch"/>
</select>
- <select id="selectConfigList" parameterType="SysConfig" resultMap="SysConfigResult">
+ <select id="selectConfigList" parameterType="com.ruoyi.system.domain.SysConfig" resultMap="SysConfigResult">
<include refid="selectConfigVo"/>
<where>
<if test="configName != null and configName != ''">
@@ -69,7 +69,7 @@
where config_key = #{configKey} limit 1
</select>
- <insert id="insertConfig" parameterType="SysConfig">
+ <insert id="insertConfig" parameterType="com.ruoyi.system.domain.SysConfig">
insert into sys_config (
<if test="configName != null and configName != '' ">config_name,</if>
<if test="configKey != null and configKey != '' ">config_key,</if>
@@ -89,7 +89,7 @@
)
</insert>
- <update id="updateConfig" parameterType="SysConfig">
+ <update id="updateConfig" parameterType="com.ruoyi.system.domain.SysConfig">
update sys_config
<set>
<if test="configName != null and configName != ''">config_name = #{configName},</if>
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
index cf439f6..83da4b4 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysDeptMapper">
- <resultMap type="SysDept" id="SysDeptResult">
+ <resultMap type="com.ruoyi.common.core.domain.entity.SysDept" id="SysDeptResult">
<id property="deptId" column="dept_id" />
<result property="parentId" column="parent_id" />
<result property="ancestors" column="ancestors" />
@@ -27,7 +27,7 @@
from sys_dept d
</sql>
- <select id="selectDeptList" parameterType="SysDept" resultMap="SysDeptResult">
+ <select id="selectDeptList" parameterType="com.ruoyi.common.core.domain.entity.SysDept" resultMap="SysDeptResult">
<include refid="selectDeptVo"/>
where d.del_flag = '0'
<if test="deptId != null and deptId != 0">
@@ -87,7 +87,7 @@
where dept_name=#{deptName} and parent_id = #{parentId} and del_flag = '0' limit 1
</select>
- <insert id="insertDept" parameterType="SysDept">
+ <insert id="insertDept" parameterType="com.ruoyi.common.core.domain.entity.SysDept">
insert into sys_dept(
<if test="deptId != null and deptId != 0">dept_id,</if>
<if test="parentId != null and parentId != 0">parent_id,</if>
@@ -115,7 +115,7 @@
)
</insert>
- <update id="updateDept" parameterType="SysDept">
+ <update id="updateDept" parameterType="com.ruoyi.common.core.domain.entity.SysDept">
update sys_dept
<set>
<if test="parentId != null and parentId != 0">parent_id = #{parentId},</if>
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml
index 8da9030..79275bf 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysDictDataMapper">
- <resultMap type="SysDictData" id="SysDictDataResult">
+ <resultMap type="com.ruoyi.common.core.domain.entity.SysDictData" id="SysDictDataResult">
<id property="dictCode" column="dict_code" />
<result property="dictSort" column="dict_sort" />
<result property="dictLabel" column="dict_label" />
@@ -25,7 +25,7 @@
from sys_dict_data
</sql>
- <select id="selectDictDataList" parameterType="SysDictData" resultMap="SysDictDataResult">
+ <select id="selectDictDataList" parameterType="com.ruoyi.common.core.domain.entity.SysDictData" resultMap="SysDictDataResult">
<include refid="selectDictDataVo"/>
<where>
<if test="dictType != null and dictType != ''">
@@ -41,7 +41,7 @@
order by dict_sort asc
</select>
- <select id="selectDictDataByType" parameterType="SysDictData" resultMap="SysDictDataResult">
+ <select id="selectDictDataByType" parameterType="com.ruoyi.common.core.domain.entity.SysDictData" resultMap="SysDictDataResult">
<include refid="selectDictDataVo"/>
where status = '0' and dict_type = #{dictType} order by dict_sort asc
</select>
@@ -71,7 +71,7 @@
</foreach>
</delete>
- <update id="updateDictData" parameterType="SysDictData">
+ <update id="updateDictData" parameterType="com.ruoyi.common.core.domain.entity.SysDictData">
update sys_dict_data
<set>
<if test="dictSort != null">dict_sort = #{dictSort},</if>
@@ -93,7 +93,7 @@
update sys_dict_data set dict_type = #{newDictType} where dict_type = #{oldDictType}
</update>
- <insert id="insertDictData" parameterType="SysDictData">
+ <insert id="insertDictData" parameterType="com.ruoyi.common.core.domain.entity.SysDictData">
insert into sys_dict_data(
<if test="dictSort != null">dict_sort,</if>
<if test="dictLabel != null and dictLabel != ''">dict_label,</if>
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
index 55b4075..1da5586 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysDictTypeMapper">
- <resultMap type="SysDictType" id="SysDictTypeResult">
+ <resultMap type="com.ruoyi.common.core.domain.entity.SysDictType" id="SysDictTypeResult">
<id property="dictId" column="dict_id" />
<result property="dictName" column="dict_name" />
<result property="dictType" column="dict_type" />
@@ -20,7 +20,7 @@
from sys_dict_type
</sql>
- <select id="selectDictTypeList" parameterType="SysDictType" resultMap="SysDictTypeResult">
+ <select id="selectDictTypeList" parameterType="com.ruoyi.common.core.domain.entity.SysDictType" resultMap="SysDictTypeResult">
<include refid="selectDictTypeVo"/>
<where>
<if test="dictName != null and dictName != ''">
@@ -71,7 +71,7 @@
</foreach>
</delete>
- <update id="updateDictType" parameterType="SysDictType">
+ <update id="updateDictType" parameterType="com.ruoyi.common.core.domain.entity.SysDictType">
update sys_dict_type
<set>
<if test="dictName != null and dictName != ''">dict_name = #{dictName},</if>
@@ -84,7 +84,7 @@
where dict_id = #{dictId}
</update>
- <insert id="insertDictType" parameterType="SysDictType">
+ <insert id="insertDictType" parameterType="com.ruoyi.common.core.domain.entity.SysDictType">
insert into sys_dict_type(
<if test="dictName != null and dictName != ''">dict_name,</if>
<if test="dictType != null and dictType != ''">dict_type,</if>
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml
index 84ec0af..88c2a1a 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysLogininforMapper">
- <resultMap type="SysLogininfor" id="SysLogininforResult">
+ <resultMap type="com.ruoyi.system.domain.SysLogininfor" id="SysLogininforResult">
<id property="infoId" column="info_id" />
<result property="userName" column="user_name" />
<result property="status" column="status" />
@@ -16,12 +16,12 @@
<result property="loginTime" column="login_time" />
</resultMap>
- <insert id="insertLogininfor" parameterType="SysLogininfor">
+ <insert id="insertLogininfor" parameterType="com.ruoyi.system.domain.SysLogininfor">
insert into sys_logininfor (user_name, status, ipaddr, os, msg, login_time)
values (#{userName}, #{status}, #{ipaddr}, #{os}, #{msg}, sysdate())
</insert>
- <select id="selectLogininforList" parameterType="SysLogininfor" resultMap="SysLogininforResult">
+ <select id="selectLogininforList" parameterType="com.ruoyi.system.domain.SysLogininfor" resultMap="SysLogininforResult">
select info_id, user_name, ipaddr, login_location, browser, os, status, msg, login_time from sys_logininfor
<where>
<if test="ipaddr != null and ipaddr != ''">
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
index 17f8a9b..7762a55 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysMenuMapper">
- <resultMap type="SysMenu" id="SysMenuResult">
+ <resultMap type="com.ruoyi.common.core.domain.entity.SysMenu" id="SysMenuResult">
<id property="menuId" column="menu_id" />
<result property="menuName" column="menu_name" />
<result property="parentName" column="parent_name" />
@@ -32,7 +32,7 @@
from sys_menu
</sql>
- <select id="selectMenuList" parameterType="SysMenu" resultMap="SysMenuResult">
+ <select id="selectMenuList" parameterType="com.ruoyi.common.core.domain.entity.SysMenu" resultMap="SysMenuResult">
<include refid="selectMenuVo"/>
<where>
<if test="menuName != null and menuName != ''">
@@ -54,7 +54,7 @@
order by m.parent_id, m.order_num
</select>
- <select id="selectMenuListByUserId" parameterType="SysMenu" resultMap="SysMenuResult">
+ <select id="selectMenuListByUserId" parameterType="com.ruoyi.common.core.domain.entity.SysMenu" resultMap="SysMenuResult">
select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
from sys_menu m
left join sys_role_menu rm on m.menu_id = rm.menu_id
@@ -127,7 +127,7 @@
select count(1) from sys_menu where parent_id = #{menuId}
</select>
- <select id="checkMenuNameUnique" parameterType="SysMenu" resultMap="SysMenuResult">
+ <select id="checkMenuNameUnique" parameterType="com.ruoyi.common.core.domain.entity.SysMenu" resultMap="SysMenuResult">
<include refid="selectMenuVo"/>
where menu_name=#{menuName} and parent_id = #{parentId} limit 1
</select>
@@ -182,7 +182,7 @@
from sys_menu
</select>
- <update id="updateMenu" parameterType="SysMenu">
+ <update id="updateMenu" parameterType="com.ruoyi.common.core.domain.entity.SysMenu">
update sys_menu
<set>
<if test="menuName != null and menuName != ''">menu_name = #{menuName},</if>
@@ -205,7 +205,7 @@
where menu_id = #{menuId}
</update>
- <insert id="insertMenu" parameterType="SysMenu">
+ <insert id="insertMenu" parameterType="com.ruoyi.common.core.domain.entity.SysMenu">
insert into sys_menu(
<if test="menuId != null and menuId != 0">menu_id,</if>
<if test="parentId != null and parentId != 0">parent_id,</if>
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml
index 65d3079..9217602 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysNoticeMapper">
- <resultMap type="SysNotice" id="SysNoticeResult">
+ <resultMap type="com.ruoyi.system.domain.SysNotice" id="SysNoticeResult">
<result property="noticeId" column="notice_id" />
<result property="noticeTitle" column="notice_title" />
<result property="noticeType" column="notice_type" />
@@ -27,7 +27,7 @@
where notice_id = #{noticeId}
</select>
- <select id="selectNoticeList" parameterType="SysNotice" resultMap="SysNoticeResult">
+ <select id="selectNoticeList" parameterType="com.ruoyi.system.domain.SysNotice" resultMap="SysNoticeResult">
<include refid="selectNoticeVo"/>
<where>
<if test="noticeTitle != null and noticeTitle != ''">
@@ -42,7 +42,7 @@
</where>
</select>
- <insert id="insertNotice" parameterType="SysNotice">
+ <insert id="insertNotice" parameterType="com.ruoyi.system.domain.SysNotice">
insert into sys_notice (
<if test="noticeTitle != null and noticeTitle != '' ">notice_title, </if>
<if test="noticeType != null and noticeType != '' ">notice_type, </if>
@@ -62,7 +62,7 @@
)
</insert>
- <update id="updateNotice" parameterType="SysNotice">
+ <update id="updateNotice" parameterType="com.ruoyi.system.domain.SysNotice">
update sys_notice
<set>
<if test="noticeTitle != null and noticeTitle != ''">notice_title = #{noticeTitle}, </if>
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
index faaee57..47067b8 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysOperLogMapper">
- <resultMap type="SysOperLog" id="SysOperLogResult">
+ <resultMap type="com.ruoyi.system.domain.SysOperLog" id="SysOperLogResult">
<id property="operId" column="oper_id" />
<result property="title" column="title" />
<result property="businessType" column="business_type" />
@@ -35,12 +35,12 @@
from sys_oper_log
</sql>
- <insert id="insertOperlog" parameterType="SysOperLog">
+ <insert id="insertOperlog" parameterType="com.ruoyi.system.domain.SysOperLog">
insert into sys_oper_log(title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, cost_time,companyName,roleName,phonenumber,userId,nickName, oper_time)
values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName}, #{operUrl}, #{operIp}, #{operLocation}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, #{costTime},#{companyName},#{roleName},#{phonenumber},#{userId},#{nickName}, sysdate())
</insert>
- <select id="selectOperLogList" parameterType="SysOperLog" resultMap="SysOperLogResult">
+ <select id="selectOperLogList" parameterType="com.ruoyi.system.domain.SysOperLog" resultMap="SysOperLogResult">
<include refid="selectOperLogVo"/>
<where>
<if test="operIp != null and operIp != ''">
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml
index 227c459..4d38972 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysPostMapper">
- <resultMap type="SysPost" id="SysPostResult">
+ <resultMap type="com.ruoyi.system.domain.SysPost" id="SysPostResult">
<id property="postId" column="post_id" />
<result property="postCode" column="post_code" />
<result property="postName" column="post_name" />
@@ -22,7 +22,7 @@
from sys_post
</sql>
- <select id="selectPostList" parameterType="SysPost" resultMap="SysPostResult">
+ <select id="selectPostList" parameterType="com.ruoyi.system.domain.SysPost" resultMap="SysPostResult">
<include refid="selectPostVo"/>
<where>
<if test="postCode != null and postCode != ''">
@@ -72,7 +72,7 @@
where post_code=#{postCode} limit 1
</select>
- <update id="updatePost" parameterType="SysPost">
+ <update id="updatePost" parameterType="com.ruoyi.system.domain.SysPost">
update sys_post
<set>
<if test="postCode != null and postCode != ''">post_code = #{postCode},</if>
@@ -86,7 +86,7 @@
where post_id = #{postId}
</update>
- <insert id="insertPost" parameterType="SysPost" useGeneratedKeys="true" keyProperty="postId">
+ <insert id="insertPost" parameterType="com.ruoyi.system.domain.SysPost" useGeneratedKeys="true" keyProperty="postId">
insert into sys_post(
<if test="postId != null and postId != 0">post_id,</if>
<if test="postCode != null and postCode != ''">post_code,</if>
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml
index 7c4139b..73c13e6 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysRoleDeptMapper">
- <resultMap type="SysRoleDept" id="SysRoleDeptResult">
+ <resultMap type="com.ruoyi.system.domain.SysRoleDept" id="SysRoleDeptResult">
<result property="roleId" column="role_id" />
<result property="deptId" column="dept_id" />
</resultMap>
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
index c382378..34e0882 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysRoleMapper">
- <resultMap type="SysRole" id="SysRoleResult">
+ <resultMap type="com.ruoyi.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.ruoyi.common.core.domain.entity.SysRole" resultMap="SysRoleResult">
<include refid="selectRoleVo"/>
where r.del_flag = '0'
<if test="roleId != null and roleId != 0">
@@ -138,7 +138,7 @@
where t1.user_id = #{userId}
</select>
- <insert id="insertRole" parameterType="SysRole" useGeneratedKeys="true" keyProperty="roleId">
+ <insert id="insertRole" parameterType="com.ruoyi.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>
@@ -166,7 +166,7 @@
)
</insert>
- <update id="updateRole" parameterType="SysRole">
+ <update id="updateRole" parameterType="com.ruoyi.common.core.domain.entity.SysRole">
update sys_role
<set>
<if test="roleName != null and roleName != ''">role_name = #{roleName},</if>
@@ -182,7 +182,7 @@
</set>
where role_id = #{roleId}
</update>
- <update id="updateStatus" parameterType="SysRole">
+ <update id="updateStatus" parameterType="com.ruoyi.common.core.domain.entity.SysRole">
update sys_role
<set>
<if test="status != null">status = #{status},</if>
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
index 2853301..0c2b381 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysRoleMenuMapper">
- <resultMap type="SysRoleMenu" id="SysRoleMenuResult">
+ <resultMap type="com.ruoyi.system.domain.SysRoleMenu" id="SysRoleMenuResult">
<result property="roleId" column="role_id" />
<result property="menuId" column="menu_id" />
</resultMap>
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index c7a05b6..d1cf59f 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysUserMapper">
- <resultMap type="SysUser" id="SysUserResult">
+ <resultMap type="com.ruoyi.common.core.domain.entity.SysUser" id="SysUserResult">
<id property="userId" column="user_id" />
<result property="deptId" column="dept_id" />
<result property="userName" column="user_name" />
@@ -31,7 +31,7 @@
<collection property="roles" javaType="java.util.List" resultMap="RoleResult" />
</resultMap>
- <resultMap id="deptResult" type="SysDept">
+ <resultMap id="deptResult" type="com.ruoyi.common.core.domain.entity.SysDept">
<id property="deptId" column="dept_id" />
<result property="parentId" column="parent_id" />
<result property="deptName" column="dept_name" />
@@ -41,7 +41,7 @@
<result property="status" column="dept_status" />
</resultMap>
- <resultMap id="RoleResult" type="SysRole">
+ <resultMap id="RoleResult" type="com.ruoyi.common.core.domain.entity.SysRole">
<id property="roleId" column="role_id" />
<result property="roleName" column="role_name" />
<result property="roleKey" column="role_key" />
@@ -62,7 +62,7 @@
left join sys_role r on r.role_id = ur.role_id
</sql>
- <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
+ <select id="selectUserList" parameterType="com.ruoyi.common.core.domain.entity.SysUser" resultMap="SysUserResult">
select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date,
u.create_by, u.create_time, u.remark, d.dept_name, d.leader ,u.disableRemark
from sys_user u
@@ -93,7 +93,7 @@
${params.dataScope}
</select>
- <select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
+ <select id="selectAllocatedList" parameterType="com.ruoyi.common.core.domain.entity.SysUser" resultMap="SysUserResult">
select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time,u.disableRemark
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
@@ -110,7 +110,7 @@
${params.dataScope}
</select>
- <select id="selectUnallocatedList" parameterType="SysUser" resultMap="SysUserResult">
+ <select id="selectUnallocatedList" parameterType="com.ruoyi.common.core.domain.entity.SysUser" resultMap="SysUserResult">
select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time,u.disableRemark
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
@@ -253,7 +253,7 @@
select user_id from sys_user where phonenumber = #{phonenumber} and status = 0 and del_flag = 0
</select>
- <insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
+ <insert id="insertUser" parameterType="com.ruoyi.common.core.domain.entity.SysUser" useGeneratedKeys="true" keyProperty="userId">
insert into sys_user(
<if test="userId != null and userId != 0">user_id,</if>
<if test="deptId != null and deptId != 0">dept_id,</if>
@@ -292,7 +292,7 @@
)
</insert>
- <update id="updateUser" parameterType="SysUser">
+ <update id="updateUser" parameterType="com.ruoyi.common.core.domain.entity.SysUser">
update sys_user
<set>
<if test="deptId != null and deptId != 0">dept_id = #{deptId},</if>
@@ -315,15 +315,15 @@
where user_id = #{userId}
</update>
- <update id="updateUserStatus" parameterType="SysUser">
+ <update id="updateUserStatus" parameterType="com.ruoyi.common.core.domain.entity.SysUser">
update sys_user set status = #{status} where user_id = #{userId}
</update>
- <update id="updateUserAvatar" parameterType="SysUser">
+ <update id="updateUserAvatar" parameterType="com.ruoyi.common.core.domain.entity.SysUser">
update sys_user set avatar = #{avatar} where user_name = #{userName}
</update>
- <update id="resetUserPwd" parameterType="SysUser">
+ <update id="resetUserPwd" parameterType="com.ruoyi.common.core.domain.entity.SysUser">
update sys_user set password = #{password} where user_name = #{userName}
</update>
<update id="updatePassword">
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml
index 2b90bc4..f4ae46f 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysUserPostMapper">
- <resultMap type="SysUserPost" id="SysUserPostResult">
+ <resultMap type="com.ruoyi.system.domain.SysUserPost" id="SysUserPostResult">
<result property="userId" column="user_id" />
<result property="postId" column="post_id" />
</resultMap>
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml
index f7715e4..407092f 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysUserRoleMapper">
- <resultMap type="SysUserRole" id="SysUserRoleResult">
+ <resultMap type="com.ruoyi.system.domain.SysUserRole" id="SysUserRoleResult">
<result property="userId" column="user_id" />
<result property="roleId" column="role_id" />
</resultMap>
@@ -34,7 +34,7 @@
insert into sys_user_role(user_id, role_id) values (#{userRole.userId},#{userRole.roleId})
</insert>
- <delete id="deleteUserRoleInfo" parameterType="SysUserRole">
+ <delete id="deleteUserRoleInfo" parameterType="com.ruoyi.system.domain.SysUserRole">
delete from sys_user_role where user_id=#{userId} and role_id=#{roleId}
</delete>
--
Gitblit v1.7.1