fix: 部门修改状态

wl

2022-12-12 c555c3d20cfc020bf9cece3146ea32bcc59950f1

 ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java

@@ -4,13 +4,11 @@
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
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;
@@ -24,10 +22,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;
@@ -141,7 +137,7 @@
            }
            umsRoleMenuRelations
                    .stream()
                    .map(item->item.getMenuId())
                    .map(item -> item.getMenuId())
                    .collect(Collectors.toList())
                    .stream()
                    .distinct()
@@ -156,8 +152,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;
    }

@@ -179,7 +182,7 @@
            token = jwtTokenUtil.generateToken(userDetails.getUserId(), userDetails.getUsername());
            redisService.set(RedisKey.PLATFORM_TOKEN_KEY.concat(username), token, LiveTimeMillisecond.s7200.time);
//            updateLoginTimeByUsername(username);
            insertLoginLog(username);
            //insertLoginLog(username);
        } catch (AuthenticationException e) {
            LOGGER.warn("登录异常:{}", e.getMessage());
        }
@@ -294,15 +297,16 @@
            return umsMenuList;
        }
        umsMenuList = umsMenuMapper.getMenuList(adminId);
            getCacheService().setResourceList(adminId, umsMenuList);
        getCacheService().setResourceList(adminId, umsMenuList);
        return umsMenuList;
    }

    @Override
    public int updatePassword(UpdateAdminPasswordParam param) {
        if (StrUtil.isEmpty(param.getUsername())
                || StrUtil.isEmpty(param.getOldPassword())
                || StrUtil.isEmpty(param.getNewPassword())) {
        if (StrUtil.isNotEmpty(param.getUsername())
                && StrUtil.isNotEmpty(param.getOldPassword())
                && StrUtil.isNotEmpty(param.getNewPassword())
                && !param.getNewPassword().matches("^(?=.*\\d)(?=.*[a-z])(?=.*[A-Z])[a-zA-Z0-9]{6,16}$")) {
            return -1;
        }
        QueryWrapper<UmsAdmin> wrapper = new QueryWrapper<>();
@@ -338,11 +342,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<>();
       /* LambdaQueryWrapper<UmsAdmin> queryWrapper = new LambdaQueryWrapper<>();

        if (StringUtils.isNotBlank(pageUserVO.getKeyword())) {
            queryWrapper.like(UmsAdmin::getUsername, pageUserVO.getKeyword())
@@ -354,23 +358,19 @@
        }
        if (PojoUtils.Vo.isUsefulSearchParam(pageUserVO.getUserType())) {
            queryWrapper.eq(UmsAdmin::getUserType, pageUserVO.getUserType());
        }*/
        UmsAdmin umsAdmin = new UmsAdmin();
        if (pageUserVO.getUserType() != null) {
            umsAdmin.setUserType(pageUserVO.getUserType());
        }
        if (PojoUtils.Vo.isUsefulSearchParam(pageUserVO.getDepartmentId())) {
            queryWrapper.eq(UmsAdmin::getDepartmentId, pageUserVO.getDepartmentId());
        if (pageUserVO.getKeyword() != null && !("".equals(pageUserVO.getKeyword()))) {
            umsAdmin.setKeyword(pageUserVO.getKeyword());
        }
        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);
            });
        if (pageUserVO.getJobTitle() != null && !("".equals(pageUserVO.getJobTitle()))) {
            umsAdmin.setJobTitle(pageUserVO.getJobTitle());
        }
        Page<UmsAdmin> page1 = baseMapper.selectCondPage(page, umsAdmin);

        return page1;
    }