Browse Source

微调

contract
Yen 2 years ago
parent
commit
f14bfdc647
  1. 8
      src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java
  2. 7
      src/main/java/com/qs/serve/modules/sys/entity/SysUser.java

8
src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java

@ -3,6 +3,7 @@ package com.qs.serve.modules.sys.controller;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.crypto.SecureUtil; import cn.hutool.crypto.SecureUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.github.pagehelper.PageHelper;
import com.qs.serve.common.framework.security.model.LoginUser; import com.qs.serve.common.framework.security.model.LoginUser;
import com.qs.serve.common.model.annotation.SysLog; import com.qs.serve.common.model.annotation.SysLog;
import com.qs.serve.common.model.consts.GySysConst; import com.qs.serve.common.model.consts.GySysConst;
@ -152,16 +153,17 @@ public class SysUserController {
* @param param * @param param
* @return * @return
*/ */
@GetMapping("/page") @PostMapping("/page")
@PreAuthorize("hasRole('sys:user:query')") @PreAuthorize("hasRole('sys:user:query')")
public R<PageVo<SysUser>> getPage(SysUser param){ public R<PageVo<SysUser>> getPage(@RequestBody SysUser param){
param.setTenantId(AuthContextUtils.getTenant()); param.setTenantId(AuthContextUtils.getTenant());
if(CollectionUtil.isNotEmpty(param.getMultiDeptIds()) && param.getLoadChildDept()!=null && param.getLoadChildDept().equals(GySysConst.STATUS_YES_1)){ if(CollectionUtil.isNotEmpty(param.getMultiDeptIds()) && param.getLoadChildDept()!=null && param.getLoadChildDept().equals(GySysConst.STATUS_YES_1)){
List<SysDept> deptList = sysDeptService.listDeptByIds(param.getMultiDeptIds(),param.getLoadChildDept().equals(GySysConst.STATUS_YES_1)); List<SysDept> deptList = sysDeptService.listDeptByIds(param.getMultiDeptIds(),param.getLoadChildDept().equals(GySysConst.STATUS_YES_1));
List<String> deptIds = deptList.stream().map(SysDept::getId).distinct().collect(Collectors.toList()); List<String> deptIds = deptList.stream().map(SysDept::getId).distinct().collect(Collectors.toList());
param.setMultiDeptIds(deptIds); param.setMultiDeptIds(deptIds);
} }
PageUtil.startPage(); //PageUtil.startPage();
PageHelper.startPage(param.getPageNum(),param.getPageSize());
List<SysUser> list = sysUserService.listUser(param); List<SysUser> list = sysUserService.listUser(param);
//前端页面展示参数 //前端页面展示参数
list.forEach(a->sysUserService.relateInfo(a,false)); list.forEach(a->sysUserService.relateInfo(a,false));

7
src/main/java/com/qs/serve/modules/sys/entity/SysUser.java

@ -188,6 +188,13 @@ public class SysUser implements Serializable {
@TableField(exist = false) @TableField(exist = false)
private Object leaveInfo; private Object leaveInfo;
@TableField(exist = false)
private Integer pageNum;
@TableField(exist = false)
private Integer pageSize;
/** /**
* 返回前端过滤敏感信息 * 返回前端过滤敏感信息
* @return * @return

Loading…
Cancel
Save