From fd10524313fa9178c4897ee955e58647d02f8dc9 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 21 九月 2023 14:51:39 +0800
Subject: [PATCH] 代码提交
---
server/service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 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 fd6827f..83c8fb6 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
@@ -121,25 +121,28 @@
Wrapper<SystemUser> wrapper = new QueryWrapper<>(systemUser);
return systemUserMapper.selectList(wrapper);
}
-
+
@Override
public PageData<SystemUserListVO> findPage(PageWrap<QuerySystemUserDTO> pageWrap) {
// 鏍归儴闂ㄦ潯浠跺鐞嗭紙闇�鏌ヨ鏍归儴闂ㄤ笅鎵�鏈夐儴闂ㄧ殑鐢ㄦ埛锛�
if (pageWrap.getModel().getRootDeptId() != null) {
- pageWrap.getModel().setDepartmentIds(getDeptIds(pageWrap.getModel().getRootDeptId()));
+// 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);
+// List<SystemDepartment> list = systemDepartmentService.findList(new QueryWrapper<>());
+// List<Integer> collect = list.stream().map(s -> s.getId()).collect(Collectors.toList());
+// pageWrap.getModel().setDepartmentIds(collect);
}
// 鎵ц鏌ヨ
PageHelper.startPage(pageWrap.getPage(), pageWrap.getCapacity());
List<SystemUserListVO> userList = systemUserMapper.selectManageList(pageWrap.getModel(), pageWrap.getOrderByClause());
+ String zhuboRoomUrl = systemDictDataBiz.queryByCode(Constants.OSS, 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));
}
@@ -219,6 +222,20 @@
}
+ @Override
+ public List<SystemUser> findAllList(SystemUser pageWrap){
+ MPJLambdaWrapper<SystemUser> queryWrapper = new MPJLambdaWrapper<>();
+
+ queryWrapper.selectAll(SystemUser.class);
+ queryWrapper.eq(SystemUser::getDeleted, Constants.ZERO)
+ .eq(SystemUser::getType,pageWrap.getType());
+ queryWrapper.orderByDesc(SystemUser::getCreateTime);
+ List<SystemUser> result = systemUserJoinMapper.selectJoinList(SystemUser.class, queryWrapper);
+
+ return result;
+ }
+
+
--
Gitblit v1.9.3