From 6ad15600563934e9718a467e94cb359167f12d9f Mon Sep 17 00:00:00 2001
From: yijiusmile <253281376@qq.com>
Date: 星期日, 14 三月 2021 23:07:37 +0800
Subject: [PATCH] 用户管理增加部门权限控制
---
febs-server/febs-server-system/src/main/resources/mapper/UserMapper.xml | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/febs-server/febs-server-system/src/main/resources/mapper/UserMapper.xml b/febs-server/febs-server-system/src/main/resources/mapper/UserMapper.xml
index 9e0e51e..d512c96 100644
--- a/febs-server/febs-server-system/src/main/resources/mapper/UserMapper.xml
+++ b/febs-server/febs-server-system/src/main/resources/mapper/UserMapper.xml
@@ -1,10 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cc.mrbird.febs.server.system.mapper.UserMapper">
- <select id="findUserDetailPage" parameterType="systemUser" resultType="systemUser">
+ <select id="findUserDetailPage" parameterType="cc.mrbird.febs.common.core.entity.system.SystemUser" resultType="cc.mrbird.febs.common.core.entity.system.SystemUser">
SELECT
u.user_id userId,
u.username,
+ u.certificateNumb,
+ u.nickName,
u.email,
u.mobile,
u.status,
@@ -43,16 +45,17 @@
AND d.dept_name like CONCAT('%',#{user.deptName},'%')
</if>
<if test="user.createTimeFrom != null and user.createTimeFrom !=''">
- And u.create_time > #{user.createTimeFrom}
+ AND u.create_time > #{user.createTimeFrom}
</if>
<if test="user.createTimeTo!= null and user.createTimeTo !=''">
- And u.create_time < #{user.createTimeTo}
+ AND u.create_time < #{user.createTimeTo}
</if>
+ AND d.DEPT_ID IN (SELECT DEPT_ID FROM t_user_data_permission WHERE USER_ID= #{currentUserId} )
group by u.username,u.user_id,u.email,u.mobile,u.status,u.create_time,u.ssex,
u.dept_id,u.last_login_time,u.modify_time,u.description,u.avatar
</select>
- <select id="findUserDetail" parameterType="systemUser" resultType="systemUser">
+ <select id="findUserDetail" parameterType="cc.mrbird.febs.common.core.entity.system.SystemUser" resultType="cc.mrbird.febs.common.core.entity.system.SystemUser">
SELECT
u.user_id userId,
u.username,
--
Gitblit v1.8.0