From 293bdee572c9d51a93656f98da441ce31ac38d6e Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期二, 19 九月 2023 15:30:37 +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..b1136c1 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,16 +121,16 @@
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());
@@ -219,6 +219,23 @@
}
+ @Override
+ public List<SystemUser> findAllList(SystemUser pageWrap){
+ 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.orderByDesc(SystemUser::getCreateTime);
+ List<SystemUser> result = systemUserJoinMapper.selectJoinList(SystemUser.class, queryWrapper);
+
+ return result;
+ }
+
+
--
Gitblit v1.9.3