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 | 10 +++++-----
1 files changed, 5 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 b1136c1..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
@@ -135,11 +135,14 @@
// 鎵ц鏌ヨ
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));
}
@@ -224,11 +227,8 @@
MPJLambdaWrapper<SystemUser> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.selectAll(SystemUser.class);
- queryWrapper.eq(SystemUser::getDeleted, Constants.ZERO);
- queryWrapper.and(StringUtils.isNotBlank(pageWrap.getUsername()),ms->ms.like(SystemUser::getUsername,pageWrap.getUsername())
- .or().like(SystemUser::getMobile,pageWrap.getUsername())
- .or().like(SystemUser::getRealname,pageWrap.getUsername())
- );
+ queryWrapper.eq(SystemUser::getDeleted, Constants.ZERO)
+ .eq(SystemUser::getType,pageWrap.getType());
queryWrapper.orderByDesc(SystemUser::getCreateTime);
List<SystemUser> result = systemUserJoinMapper.selectJoinList(SystemUser.class, queryWrapper);
--
Gitblit v1.9.3