DeXun/fad_oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

三期内容优化

Browse Source
This commit is contained in:
hdka
2025-03-19 21:37:54 +08:00
parent aa64312441
commit ed7012e2dd
24 changed files with 671 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
View File

@@ -26,6 +26,7 @@
<result property="remark" column="remark"/>
<result property="idCard" column="id_card"/>
<result property="bankCard" column="bank_card"/>
<result property="insure" column="insure"/>
<result property="laborCost" column="labor_cost"/>
<association property="dept" column="dept_id" javaType="SysDept" resultMap="deptResult"/>
<collection property="roles" javaType="java.util.List" resultMap="RoleResult"/>
@@ -65,6 +66,7 @@
select u.user_id,
u.dept_id,
u.user_name,
u.insure,
u.nick_name,
u.user_type,
u.email,
@@ -102,7 +104,7 @@
</sql>
<select id="selectPageUserList" resultMap="SysUserResult">
select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex,u.id_card,u.bank_card,u.labor_cost,
select u.user_id, u.insure, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex,u.id_card,u.bank_card,u.labor_cost,
u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader,sr.role_id,sr.role_name
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
@@ -112,7 +114,7 @@
</select>
<select id="selectUserList" resultMap="SysUserResult">
select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex,
select u.user_id, u.insure, 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
left join sys_dept d on u.dept_id = d.dept_id
@@ -120,7 +122,7 @@
</select>
<select id="selectAllocatedList" 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.insure, u.dept_id, u.user_name, u.nick_name, 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 sur on u.user_id = sur.user_id
@@ -129,7 +131,7 @@
</select>
<select id="selectUnallocatedList" 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.insure, u.dept_id, u.user_name, u.nick_name, 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 sur on u.user_id = sur.user_id
@@ -163,7 +165,7 @@
<select id="selectListAndNotDel" resultMap="ClearUser">
select user_id,user_name,nick_name,labor_cost from sys_user where del_flag ='0'
select user_id,user_name, u.insure,nick_name,labor_cost from sys_user where del_flag ='0'
</select>