From c8bd69da6d5c5c40fc4456b52476ecd76209aeae Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期五, 28 十月 2022 11:17:30 +0800
Subject: [PATCH] 修改用户逻辑和用户修改部门逻辑
---
ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java | 22 +++++-----------------
1 files changed, 5 insertions(+), 17 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
index 7664f29..85aa93d 100644
--- a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
@@ -10,6 +10,7 @@
import com.ycl.bo.AdminUserDetails;
import com.ycl.dto.UmsAdminParam;
import com.ycl.dto.UpdateAdminPasswordParam;
+import com.ycl.entity.depart.UmsDepart;
import com.ycl.entity.user.*;
import com.ycl.exception.ApiException;
import com.ycl.exception.Asserts;
@@ -79,6 +80,8 @@
AdminMenuRelationMapper adminMenuRelationMapper;
@Resource
UmsMenuMapper umsMenuMapper;
+ @Resource
+ UmsAdminMapper umsAdminMapper;
@Override
public UmsAdmin getAdminByUsername(String username) {
@@ -342,26 +345,11 @@
}
@Override
- public IPage<UmsAdmin> pageUser(UserVO.PageUserVO pageUserVO) {
+ public Page<UmsAdmin> pageUser(UserVO.PageUserVO pageUserVO) {
int pageSize = pageUserVO.getPageSize();
int current = pageUserVO.getCurrent();
Page<UmsAdmin> page = new Page<>(current, pageSize);
- /* LambdaQueryWrapper<UmsAdmin> queryWrapper = new LambdaQueryWrapper<>();
-
- if (StringUtils.isNotBlank(pageUserVO.getKeyword())) {
- queryWrapper.like(UmsAdmin::getUsername, pageUserVO.getKeyword())
- .or().like(UmsAdmin::getNickName, pageUserVO.getKeyword())
- .or().like(UmsAdmin::getMobile, pageUserVO.getKeyword());
- }
- if (StringUtils.isNotBlank(pageUserVO.getJobTitle())) {
- queryWrapper.eq(UmsAdmin::getJobTitle, pageUserVO.getJobTitle());
- }
- if (PojoUtils.Vo.isUsefulSearchParam(pageUserVO.getUserType())) {
- queryWrapper.eq(UmsAdmin::getUserType, pageUserVO.getUserType());
- }*/
- Page<UmsAdmin> page1 = baseMapper.selectCondPage(page,pageUserVO);
-
- return page1;
+ return umsAdminMapper.selectPageByWordKey(page,pageUserVO.getKeyword());
}
@Override
--
Gitblit v1.8.0