From 99cb4723573c6c7e387da47667add0cced666fc2 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 21 八月 2024 15:39:21 +0800
Subject: [PATCH] 1
---
se-modules/se-system/src/main/resources/mapper/system/SysUserMapper.xml | 12 ++++++++----
docker-compose/mysql/initdb/se_cloud_20240629.sql | 2 ++
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/docker-compose/mysql/initdb/se_cloud_20240629.sql b/docker-compose/mysql/initdb/se_cloud_20240629.sql
index befae6a..24fc14b 100644
--- a/docker-compose/mysql/initdb/se_cloud_20240629.sql
+++ b/docker-compose/mysql/initdb/se_cloud_20240629.sql
@@ -76,6 +76,7 @@
-- ----------------------------
insert into sys_user values(1, 103, 'admin', '', '00', '1', 'ry@163.com', '15888888888', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', sysdate(), 'admin', sysdate(), '', null, '绠＄悊鍛�');
insert into sys_user values(2, 105, 'ry', '', '00', '1', 'ry@qq.com', '15666666666', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', sysdate(), 'admin', sysdate(), '', null, '娴嬭瘯鍛�');
+-- select * from sys_user;
-- ----------------------------
-- 3銆佸矖浣嶄俊鎭〃
@@ -534,6 +535,7 @@
insert into sys_dict_data values(27, 9, '娓呯┖鏁版嵁', '9', 'sys_oper_type', '', 'danger', 'N', '0', 'admin', sysdate(), '', null, '娓呯┖鎿嶄綔');
insert into sys_dict_data values(28, 1, '鎴愬姛', '0', 'sys_common_status', '', 'primary', 'N', '0', 'admin', sysdate(), '', null, '姝ｅ父鐘舵��');
insert into sys_dict_data values(29, 2, '澶辫触', '1', 'sys_common_status', '', 'danger', 'N', '0', 'admin', sysdate(), '', null, '鍋滅敤鐘舵��');
+-- https://blog.csdn.net/weixin_56154577/article/details/136803617
insert into sys_dict_data values(30, 1, 'AES鍔犲瘑', '1', 'sys_encryption_method', '', '', 'Y', '0', 'admin', sysdate(), '', null, 'AES鍔犲瘑绠楁硶');
insert into sys_dict_data values(31, 2, 'DES鍔犲瘑', '2', 'sys_encryption_method', '', '', 'N', '0', 'admin', sysdate(), '', null, 'DES鍔犲瘑绠楁硶');
insert into sys_dict_data values(32, 3, 'RSA鍔犲瘑', '3', 'sys_encryption_method', '', '', 'N', '0', 'admin', sysdate(), '', null, 'RSA鍔犲瘑绠楁硶');
diff --git a/se-modules/se-system/src/main/resources/mapper/system/SysUserMapper.xml b/se-modules/se-system/src/main/resources/mapper/system/SysUserMapper.xml
index 90c0288..cf65b3e 100644
--- a/se-modules/se-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/se-modules/se-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -9,6 +9,7 @@
<result property="deptId" column="dept_id" />
<result property="userName" column="user_name" />
<result property="nickName" column="nick_name" />
+ <result property="secretLevel" column="secret_level" />
<result property="email" column="email" />
<result property="phonenumber" column="phonenumber" />
<result property="sex" column="sex" />
@@ -47,7 +48,7 @@
</resultMap>
<sql id="selectUserVo">
- select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
+ select u.user_id, u.dept_id, u.user_name, u.nick_name, u.secret_level, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
from sys_user u
@@ -57,7 +58,7 @@
</sql>
<select id="selectUserList" parameterType="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 from sys_user u
+ select u.user_id, u.dept_id, u.nick_name, u.user_name, u.secret_level, 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 from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
where u.del_flag = '0'
<if test="userId != null and userId != 0">
@@ -86,7 +87,7 @@
</select>
<select id="selectAllocatedList" parameterType="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
+ select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.secret_level, u.email, u.phonenumber, u.status, u.create_time
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
left join sys_user_role ur on u.user_id = ur.user_id
@@ -103,7 +104,7 @@
</select>
<select id="selectUnallocatedList" parameterType="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
+ select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.secret_level, u.email, u.phonenumber, u.status, u.create_time
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
left join sys_user_role ur on u.user_id = ur.user_id
@@ -148,6 +149,7 @@
<if test="deptId != null and deptId != 0">dept_id,</if>
<if test="userName != null and userName != ''">user_name,</if>
<if test="nickName != null and nickName != ''">nick_name,</if>
+ <if test="secretLevel != null and secretLevel != ''">secret_level,</if>
<if test="email != null and email != ''">email,</if>
<if test="avatar != null and avatar != ''">avatar,</if>
<if test="phonenumber != null and phonenumber != ''">phonenumber,</if>
@@ -162,6 +164,7 @@
<if test="deptId != null and deptId != ''">#{deptId},</if>
<if test="userName != null and userName != ''">#{userName},</if>
<if test="nickName != null and nickName != ''">#{nickName},</if>
+ <if test="secretLevel != null and secretLevel != ''">#{secretLevel},</if>
<if test="email != null and email != ''">#{email},</if>
<if test="avatar != null and avatar != ''">#{avatar},</if>
<if test="phonenumber != null and phonenumber != ''">#{phonenumber},</if>
@@ -180,6 +183,7 @@
<if test="deptId != null and deptId != 0">dept_id = #{deptId},</if>
<if test="userName != null and userName != ''">user_name = #{userName},</if>
<if test="nickName != null and nickName != ''">nick_name = #{nickName},</if>
+ <if test="secretLevel != null and secretLevel != ''">secret_level = #{secretLevel},</if>
<if test="email != null ">email = #{email},</if>
<if test="phonenumber != null ">phonenumber = #{phonenumber},</if>
<if test="sex != null and sex != ''">sex = #{sex},</if>
--
Gitblit v1.9.3