From 7ec36eee3bae7b9efa32dba01776f5760d91b81a Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期五, 28 十月 2022 11:25:14 +0800
Subject: [PATCH] 查询部门id
---
ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java | 46 ++++++++++++----------------------------------
1 files changed, 12 insertions(+), 34 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 c2748d6..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
@@ -24,10 +24,8 @@
import com.ycl.utils.SpringUtil;
import com.ycl.utils.common.LiveTimeMillisecond;
import com.ycl.utils.common.MacUtils;
-import com.ycl.utils.common.PojoUtils;
import com.ycl.utils.redis.RedisKey;
import com.ycl.vo.user.UserVO;
-import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
@@ -82,6 +80,8 @@
AdminMenuRelationMapper adminMenuRelationMapper;
@Resource
UmsMenuMapper umsMenuMapper;
+ @Resource
+ UmsAdminMapper umsAdminMapper;
@Override
public UmsAdmin getAdminByUsername(String username) {
@@ -156,8 +156,15 @@
}
//瀵圭敤鎴峰悕绯荤粺榛樿娣诲姞
//umsAdmin.setNickName(RandomUtils.getUserId(umsAdmin.getId()));
- baseMapper.updateById(umsAdmin);
+ //娣诲姞閮ㄩ棬
+ UmsDepartManage departManage = new UmsDepartManage();
+ departManage.setUserId(umsAdmin.getId());
+ departManage.setDepartId(umsAdminParam.getDepartmentId());
+ departManage.setCreateTime(new Date());
+ departManage.setUpdateTime(new Date());
+ umsDepartManageMapper.insert(departManage);
+ baseMapper.updateById(umsAdmin);
return umsAdmin;
}
@@ -338,40 +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());
- }
- if (PojoUtils.Vo.isUsefulSearchParam(pageUserVO.getDepartmentId())) {
- queryWrapper.eq(UmsAdmin::getDepartmentId, pageUserVO.getDepartmentId());
- }
- Page<UmsAdmin> page1 = baseMapper.selectPage(page, queryWrapper);
- List<UmsAdmin> records = page1.getRecords();
- if (CollUtil.isNotEmpty(records)) {
- records.forEach(e -> {
- UmsDepart umsDepart = departService.getById(e.getDepartmentId());
- if (null != umsDepart) {
- e.setDepartName(umsDepart.getDepartName());
- }
- //鑾峰彇瑙掕壊鍒楄〃
- List<UmsRole> roles = umsRoleMapper.getRoleList(e.getId());
- e.setRoles(roles);
- });
- }
- return page1;
+ return umsAdminMapper.selectPageByWordKey(page,pageUserVO.getKeyword());
}
@Override
--
Gitblit v1.8.0