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

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

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缓存时间为准）
+	// Token过期时间24小时（用户登录过期时间是此时间的两倍，以token在reids缓存时间为准）
-	public static final long EXPIRE_TIME = 180 * 60 * 1000;
+	public static final long EXPIRE_TIME = 1440 * 60 * 1000;
 //	public static final long EXPIRE_TIME = 2000;
 
 	/**

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

jero-web/src/views/system/UserList.vue

@@ -61,6 +61,16 @@
                 />
               </a-form-item>
             </a-col>
+
+            <a-col :md="6" :sm="8">
+              <a-form-item label="角色">
+                <j-search-select-tag
+                  placeholder="请选择角色"
+                  v-model="queryParam.roleId"
+                  :dictOptions="rolesList">
+                </j-search-select-tag>
+              </a-form-item>
+            </a-col>
           </template>
 
           <a-col :md="6" :sm="8">
@@ -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) {