|
@ -28,6 +28,7 @@ import cn.hutool.core.bean.BeanUtil;
|
|
|
import cn.hutool.core.collection.CollectionUtil;
|
|
|
import cn.hutool.core.lang.Dict;
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
import cn.stylefeng.guns.core.consts.CommonConstant;
|
|
|
import cn.stylefeng.guns.core.consts.SymbolConstant;
|
|
|
import cn.stylefeng.guns.core.context.constant.ConstantContextHolder;
|
|
|
import cn.stylefeng.guns.core.context.login.LoginContextHolder;
|
|
@ -427,18 +428,25 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
public List<SysUser> selector(SysUserParam sysUserParam) {
|
|
|
QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
|
|
|
public List<Dict> selector(SysUserParam sysUserParam) {
|
|
|
List<Dict> dictList = CollectionUtil.newArrayList();
|
|
|
LambdaQueryWrapper<SysUser> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
if (ObjectUtil.isNotNull(sysUserParam)) {
|
|
|
//根据姓名模糊查询
|
|
|
if (ObjectUtil.isNotEmpty(sysUserParam.getName())) {
|
|
|
queryWrapper.like("sys_user.name", sysUserParam.getName());
|
|
|
queryWrapper.like(SysUser::getName, sysUserParam.getName());
|
|
|
}
|
|
|
}
|
|
|
//查询非删除状态,排除超级管理员
|
|
|
queryWrapper.ne("sys_user.status", CommonStatusEnum.DELETED.getCode())
|
|
|
.ne("sys_user.admin_type", AdminTypeEnum.SUPER_ADMIN.getCode());
|
|
|
return this.baseMapper.selector(queryWrapper);
|
|
|
queryWrapper.ne(SysUser::getStatus, CommonStatusEnum.DELETED.getCode())
|
|
|
.ne(SysUser::getAdminType, AdminTypeEnum.SUPER_ADMIN.getCode());
|
|
|
this.list(queryWrapper).forEach(sysUser -> {
|
|
|
Dict dict = Dict.create();
|
|
|
dict.put(CommonConstant.ID, sysUser.getId());
|
|
|
dict.put(CommonConstant.NAME, sysUser.getName());
|
|
|
dictList.add(dict);
|
|
|
});
|
|
|
return dictList;
|
|
|
}
|
|
|
|
|
|
/**
|