From ea5615a5081d675700544e3c834939c18dae543e Mon Sep 17 00:00:00 2001 From: ZQN <364596817@qq.com> Date: 星期四, 27 六月 2024 14:22:18 +0800 Subject: [PATCH] 用户通用列表 --- project-system/src/main/java/com/project/system/mapper/SysUserMapper.java | 2 + project-admin/src/main/java/com/project/admin/controller/system/SysUserController.java | 6 +- project-system/src/main/resources/mapper/system/SysUserMapper.xml | 38 ++++++++++++++++++ project-system/src/main/java/com/project/system/service/ISysUserService.java | 9 ++++ project-system/src/main/java/com/project/system/service/impl/SysUserServiceImpl.java | 13 ++++++ 5 files changed, 64 insertions(+), 4 deletions(-) diff --git a/project-admin/src/main/java/com/project/admin/controller/system/SysUserController.java b/project-admin/src/main/java/com/project/admin/controller/system/SysUserController.java index 645e8e7..a90d71f 100644 --- a/project-admin/src/main/java/com/project/admin/controller/system/SysUserController.java +++ b/project-admin/src/main/java/com/project/admin/controller/system/SysUserController.java @@ -53,7 +53,7 @@ public TableDataInfo list(SysUser user) { startPage(); - List<SysUser> list = userService.selectUserList(user); + List<SysUser> list = userService.selectUserListCommon(user); return getDataTable(list); } @@ -62,7 +62,7 @@ @PostMapping("/export") public void export(HttpServletResponse response, SysUser user) { - List<SysUser> list = userService.selectUserList(user); + List<SysUser> list = userService.selectUserListCommon(user); ExcelUtil<SysUser> util = new ExcelUtil<>(SysUser.class); util.exportExcel(response, list, "鐢ㄦ埛鏁版嵁"); } @@ -201,7 +201,7 @@ /** * 閲嶇疆瀵嗙爜 */ - @PreAuthorize("@ss.hasPermi('system:user:resetPwd')") +// @PreAuthorize("@ss.hasPermi('system:user:resetPwd')") @Log(title = "鐢ㄦ埛绠$悊", businessType = BusinessType.UPDATE) @PutMapping("/resetPwd") public AjaxResult resetPwd(@RequestBody SysUser user) diff --git a/project-system/src/main/java/com/project/system/mapper/SysUserMapper.java b/project-system/src/main/java/com/project/system/mapper/SysUserMapper.java index 30a094c..83a0136 100644 --- a/project-system/src/main/java/com/project/system/mapper/SysUserMapper.java +++ b/project-system/src/main/java/com/project/system/mapper/SysUserMapper.java @@ -151,4 +151,6 @@ * @return 缁撴灉 */ int resetPhone(@Param("userId")Long userId, @Param("phone")String phone); + + List<SysUser> selectUserListCommon(SysUser user); } diff --git a/project-system/src/main/java/com/project/system/service/ISysUserService.java b/project-system/src/main/java/com/project/system/service/ISysUserService.java index 977b71d..27c70a9 100644 --- a/project-system/src/main/java/com/project/system/service/ISysUserService.java +++ b/project-system/src/main/java/com/project/system/service/ISysUserService.java @@ -14,6 +14,15 @@ */ public interface ISysUserService extends IBaseService<SysUser> { + + /** + * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ鐢ㄦ埛鍒楄〃 + * + * @param user 鐢ㄦ埛淇℃伅 + * @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅 + */ + public List<SysUser> selectUserListCommon(SysUser user); + /** * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ鐢ㄦ埛鍒楄〃 * diff --git a/project-system/src/main/java/com/project/system/service/impl/SysUserServiceImpl.java b/project-system/src/main/java/com/project/system/service/impl/SysUserServiceImpl.java index b5f469e..a1994e4 100644 --- a/project-system/src/main/java/com/project/system/service/impl/SysUserServiceImpl.java +++ b/project-system/src/main/java/com/project/system/service/impl/SysUserServiceImpl.java @@ -66,6 +66,19 @@ */ @Override @DataScope(deptAlias = "d", userAlias = "u") + public List<SysUser> selectUserListCommon(SysUser user) + { + return userMapper.selectUserListCommon(user); + } + + /** + * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ鐢ㄦ埛鍒楄〃 + * + * @param user 鐢ㄦ埛淇℃伅 + * @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅 + */ + @Override + @DataScope(deptAlias = "d", userAlias = "u") public List<SysUser> selectUserList(SysUser user) { return userMapper.selectUserList(user); diff --git a/project-system/src/main/resources/mapper/system/SysUserMapper.xml b/project-system/src/main/resources/mapper/system/SysUserMapper.xml index ed2462e..fd839b6 100644 --- a/project-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/project-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -64,12 +64,48 @@ left join sys_role r on r.role_id = ur.role_id </sql> + <select id="selectUserListCommon" parameterType="SysUser" resultMap="SysUserResult"> + select u.user_id, u.dept_id, u.nick_name, u.user_name,u.user_type, 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' and u.user_name!='admin' and u.user_type!='02' + <if test="userId != null and userId != 0"> + AND u.user_id = #{userId} + </if> + <if test="userName != null and userName != ''"> + AND u.user_name like concat('%', #{userName}, '%') + </if> + <if test="nickName != null and nickName != ''"> + AND u.nick_name like concat('%', #{nickName}, '%') + </if> + <if test="status != null and status != ''"> + AND u.status = #{status} + </if> + <if test="phonenumber != null and phonenumber != ''"> + AND u.phonenumber like concat('%', #{phonenumber}, '%') + </if> + <if test="params.beginTime != null and params.beginTime != ''"><!-- 寮�濮嬫椂闂存绱� --> + AND date_format(u.create_time,'%y%m%d') >= date_format(#{params.beginTime},'%y%m%d') + </if> + <if test="params.endTime != null and params.endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� --> + AND date_format(u.create_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d') + </if> + <if test="deptId != null and deptId != 0"> + AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) )) + </if> + <!-- 鏁版嵁鑼冨洿杩囨护 --> + <if test="params != null and params.dataScope != null and params.dataScope != ''"> + AND ${params.dataScope} + </if> + </select> + <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult"> select u.user_id, u.dept_id, u.nick_name, u.user_name,u.user_type, 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' and u.user_name!='admin' and u.user_type!='02' + where u.del_flag = '0' and u.user_name!='admin' <if test="userId != null and userId != 0"> AND u.user_id = #{userId} </if> -- Gitblit v1.9.1