From 85ac6d82939c95d605ae7fce957d7767877e0bd2 Mon Sep 17 00:00:00 2001 From: zer0Black Date: Thu, 22 Dec 2022 13:46:41 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90add=E3=80=91=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86-=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD=20=E3=80=90modify=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=99=BB=E5=BD=95=E8=BF=87=E6=9C=9F=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E9=BB=98=E8=AE=A4=E4=B8=BA24=E5=B0=8F=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/common/system/util/JwtUtil.java | 4 +-- .../system/controller/SysUserController.java | 3 ++- .../modules/system/mapper/SysUserMapper.java | 2 +- .../system/mapper/xml/SysUserMapper.xml | 4 +++ .../system/service/ISysUserService.java | 2 +- .../service/impl/SysUserServiceImpl.java | 4 +-- jero-web/src/views/system/UserList.vue | 26 ++++++++++++++++++- 7 files changed, 37 insertions(+), 8 deletions(-) diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/util/JwtUtil.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/util/JwtUtil.java index d8012a79..bae93f64 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/util/JwtUtil.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/util/JwtUtil.java @@ -28,8 +28,8 @@ import com.jero.common.util.oConvertUtils; **/ public class JwtUtil { - // Token过期时间180分钟（用户登录过期时间是此时间的两倍，以token在reids缓存时间为准） - public static final long EXPIRE_TIME = 180 * 60 * 1000; + // Token过期时间24小时（用户登录过期时间是此时间的两倍，以token在reids缓存时间为准） + public static final long EXPIRE_TIME = 1440 * 60 * 1000; // public static final long EXPIRE_TIME = 2000; /** diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java index 7b930220..f902d9bc 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java @@ -100,6 +100,7 @@ public class SysUserController { @RequestMapping(value = "/page", method = RequestMethod.GET) public Result> queryPageList(SysUser user, @RequestParam(name="departId", required = false) String departId, + @RequestParam(name="roleId", required = false) String roleId, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,HttpServletRequest req) { Result> result = new Result>(); @@ -112,7 +113,7 @@ public class SysUserController { subDepIds = sysDepartService.getSubDepIdsByDepId(departId); } - IPage pageList = sysUserService.queryPage(page, subDepIds, queryWrapper); + IPage pageList = sysUserService.queryPage(page, subDepIds, roleId, queryWrapper); //批量查询用户的所属部门 diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java index 64824039..1033194e 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java @@ -27,7 +27,7 @@ public interface SysUserMapper extends BaseMapper { * 分页查询用户，可支持组织机构检索 * @return */ - IPage queryPage(Page page, @Param("departIds") List subDepIds , @Param(Constants.WRAPPER) Wrapper wrapper); + IPage queryPage(Page page, @Param("departIds") List subDepIds , @Param("roleId") String roleId , @Param(Constants.WRAPPER) Wrapper wrapper); /** * 通过用户账号查询用户信息 diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml index 9fee9d04..9d12e35f 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml @@ -12,6 +12,10 @@ ) + + and id in (select user_id from sys_user_role where role_id = #{roleId} + ) + ${ew.sqlSegment} diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java index b48c8e17..91855988 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java @@ -34,7 +34,7 @@ public interface ISysUserService extends IService { * @param queryWrapper * @return */ - IPage queryPage(Page page, List subDepIds, QueryWrapper queryWrapper); + IPage queryPage(Page page, List subDepIds, String roleId, QueryWrapper queryWrapper); /** * 重置密码 diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java index abc6e991..a96f6ca7 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java @@ -61,8 +61,8 @@ public class SysUserServiceImpl extends ServiceImpl impl private BaseCommonService baseCommonService; @Override - public IPage queryPage(Page page, List subDepIds, QueryWrapper queryWrapper){ - return this.userMapper.queryPage(page, subDepIds, queryWrapper); + public IPage queryPage(Page page, List subDepIds, String roleId, QueryWrapper queryWrapper){ + return this.userMapper.queryPage(page, subDepIds, roleId, queryWrapper); } @Override diff --git a/jero-web/src/views/system/UserList.vue b/jero-web/src/views/system/UserList.vue index c7461781..c34862a6 100644 --- a/jero-web/src/views/system/UserList.vue +++ b/jero-web/src/views/system/UserList.vue @@ -61,6 +61,16 @@ /> + + + + + + + @@ -198,7 +208,7 @@ import UserModal from './modules/UserModal' import PasswordModal from './modules/PasswordModal' import {getAction,getFileAccessHttpUrl} from '@/api/manage'; - import {frozenBatch} from '@/api/api' + import {frozenBatch,queryall} from '@/api/api' import {JeroListMixin} from '@/mixins/JeroListMixin' import JInput from '@/components/jero/JInput' import UserRecycleBinModal from './modules/UserRecycleBinModal' @@ -222,6 +232,7 @@ recycleBinVisible: false, selectedRowKeys: [], categoryTreeList:[], // 组织机构查询的组织机构树数据 + rolesList:[], // 角色查询的角色数据 columns: [ { title: '序号', @@ -327,6 +338,7 @@ }, mounted() { this.getSysCategoryTree() + this.initRoleList() }, methods: { getAvatarView: function (avatar) { @@ -400,6 +412,7 @@ passwordModalOk() { console.log("密码修改完成") }, + // 获取组织机构树 getSysCategoryTree() { getAction(this.url.getSysCategoryTree, {}).then((res) => { if (res.success) { @@ -409,6 +422,17 @@ } }) }, + //初始化角色字典 + initRoleList(){ + queryall().then((res)=>{ + if(res.success){ + this.rolesList = res.result.map((item,index,arr)=>{ + let c = {text:item.roleName, value:item.id} + return c; + }) + } + }); + }, // 角色配置 roleAssignment() { if(this.selectedRowKeys.length == 0) {