From 92786c58666e6dcb279b29e80fd744067525bc5e Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期五, 28 六月 2024 11:55:57 +0800 Subject: [PATCH] 提交一把 --- server/service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/server/service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java b/server/service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java index 7160b8b..f93f8c0 100644 --- a/server/service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java +++ b/server/service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java @@ -167,6 +167,33 @@ } return PageData.from(new PageInfo<>(userList)); } + @Override + public PageData<SystemUserListVO> findPageCompany(PageWrap<QuerySystemUserDTO> pageWrap) { + // 鏍归儴闂ㄦ潯浠跺鐞嗭紙闇�鏌ヨ鏍归儴闂ㄤ笅鎵�鏈夐儴闂ㄧ殑鐢ㄦ埛锛� + if (pageWrap.getModel().getRootDeptId() != null) { +// pageWrap.getModel().setDepartmentIds(getDeptIds(pageWrap.getModel().getRootDeptId())); + } else { +// List<SystemDepartment> list = systemDepartmentService.findList(new QueryWrapper<>()); +// List<Integer> collect = list.stream().map(s -> s.getId()).collect(Collectors.toList()); +// pageWrap.getModel().setDepartmentIds(collect); + } + if (pageWrap.getModel().getCompanyId() == null) { + pageWrap.getModel().setCompanyId(-1); + } + // 鎵ц鏌ヨ + PageHelper.startPage(pageWrap.getPage(), pageWrap.getCapacity()); + List<SystemUserListVO> userList = systemUserMapper.selectManageList(pageWrap.getModel(), pageWrap.getOrderByClause()); + String zhuboRoomUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.ZHUBO_ROOM_URL).getCode(); + + for (SystemUserListVO user : userList) { + // 鏌ヨ鐢ㄦ埛瑙掕壊鍒楄〃 + user.setRoles(systemRoleService.findByUserId(user.getId())); + // 鏌ヨ鐢ㄦ埛宀椾綅鍒楄〃 +// user.setPositions(systemPositionService.findByUserId(user.getId())); + user.setZhuboRoomUrl(zhuboRoomUrl); + } + return PageData.from(new PageInfo<>(userList)); + } @Override public long count(SystemUser systemUser) { -- Gitblit v1.9.3