From bc1431d55206a8c5506bd3f2338852b5e2e9fc1d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 20 九月 2023 15:12:25 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/preselect into dev
---
server/service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java | 15 ++++++---------
1 files changed, 6 insertions(+), 9 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 491449c..8ad34f5 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
@@ -126,11 +126,11 @@
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());
@@ -224,11 +224,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