【add】增加用户管理-角色查询功能

【modify】修改登录过期时间默认为24小时

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<IPage<SysUser>> 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<IPage<SysUser>> result = new Result<IPage<SysUser>>();
@@ -112,7 +113,7 @@ public class SysUserController {
             subDepIds = sysDepartService.getSubDepIdsByDepId(departId);
         }
 
-        IPage<SysUser> pageList = sysUserService.queryPage(page, subDepIds, queryWrapper);
+        IPage<SysUser> pageList = sysUserService.queryPage(page, subDepIds, roleId, queryWrapper);
 
 
 		//批量查询用户的所属部门

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<SysUser> {
 	 * 分页查询用户，可支持组织机构检索
 	 * @return
 	 */
-	IPage<SysUser> queryPage(Page page, @Param("departIds") List<String> subDepIds , @Param(Constants.WRAPPER) Wrapper wrapper);
+	IPage<SysUser> queryPage(Page page, @Param("departIds") List<String> subDepIds , @Param("roleId") String roleId , @Param(Constants.WRAPPER) Wrapper wrapper);
 
 	/**
 	  * 通过用户账号查询用户信息

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml

@@ -12,6 +12,10 @@
 			</foreach>
 			)
 		</if>
+		<if test="roleId!=null and roleId!=''">
+			and id in (select user_id from sys_user_role where role_id = #{roleId}
+			)
+		</if>
 		<choose>
 			<when test="ew.sqlSegment.indexOf(' ORDER') == 0">
 				${ew.sqlSegment}

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<SysUser> {
 	 * @param queryWrapper
 	 * @return
 	 */
-	IPage<SysUser> queryPage(Page<SysUser> page, List<String> subDepIds, QueryWrapper<SysUser> queryWrapper);
+	IPage<SysUser> queryPage(Page<SysUser> page, List<String> subDepIds, String roleId, QueryWrapper<SysUser> queryWrapper);
 
 	/**
 	 * 重置密码

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<SysUserMapper, SysUser> impl
 	private BaseCommonService baseCommonService;
 
 	@Override
-	public IPage<SysUser> queryPage(Page<SysUser> page, List<String> subDepIds, QueryWrapper<SysUser> queryWrapper){
-		return this.userMapper.queryPage(page, subDepIds, queryWrapper);
+	public IPage<SysUser> queryPage(Page<SysUser> page, List<String> subDepIds, String roleId, QueryWrapper<SysUser> queryWrapper){
+		return this.userMapper.queryPage(page, subDepIds, roleId, queryWrapper);
 	}
 
     @Override