|
@@ -1,7 +1,6 @@
|
|
|
package org.jeecg.modules.system.controller;
|
|
|
|
|
|
|
|
|
-import cn.com.ctop.common.module.annotation.PermissionData;
|
|
|
import cn.com.ctop.common.module.entity.SysUser;
|
|
|
import cn.com.ctop.common.module.model.SysUserSysDepartModel;
|
|
|
import cn.com.ctop.common.module.service.ISysRoleExtService;
|
|
@@ -114,25 +113,21 @@ public class SysUserController {
|
|
|
* @param req
|
|
|
* @return
|
|
|
*/
|
|
|
- @PermissionData(pageComponent = "system/UserList")
|
|
|
@RequestMapping(value = "/list", method = RequestMethod.GET)
|
|
|
public Result<IPage<SysUser>> queryPageList(SysUser user, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
|
|
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) {
|
|
|
- Result<IPage<SysUser>> result = new Result<IPage<SysUser>>();
|
|
|
+ Result<IPage<SysUser>> result = new Result<>();
|
|
|
QueryWrapper<SysUser> queryWrapper = QueryGenerator.initQueryWrapper(user, req.getParameterMap());
|
|
|
- //TODO 外部模拟登陆临时账号,列表不显示
|
|
|
- queryWrapper.ne("username","_reserve_user_external");
|
|
|
- Page<SysUser> page = new Page<SysUser>(pageNo, pageSize);
|
|
|
+ Page<SysUser> page = new Page<>(pageNo, pageSize);
|
|
|
IPage<SysUser> pageList = sysUserService.page(page, queryWrapper);
|
|
|
|
|
|
//批量查询用户的所属部门
|
|
|
//step.1 先拿到全部的 useids
|
|
|
//step.2 通过 useids,一次性查询用户的所属部门名字
|
|
|
List<String> userIds = pageList.getRecords().stream().map(SysUser::getId).collect(Collectors.toList());
|
|
|
- if(userIds!=null && userIds.size()>0){
|
|
|
+ if(!userIds.isEmpty()){
|
|
|
Map<String,String> useDepNames = sysUserService.getDepNamesByUserIds(userIds);
|
|
|
pageList.getRecords().forEach(item->{
|
|
|
- //TODO 临时借用这个字段用于页面展示
|
|
|
item.setOrgCode(useDepNames.get(item.getId()));
|
|
|
});
|
|
|
}
|