|
|
@@ -1,5 +1,6 @@
|
|
|
package com.fdkankan.sale.service.impl;
|
|
|
|
|
|
+import cn.dev33.satoken.stp.StpUtil;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.dynamic.datasource.annotation.DS;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
@@ -28,6 +29,7 @@ import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
+import java.io.Serializable;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.Set;
|
|
|
@@ -52,6 +54,8 @@ public class SysUserServiceImpl extends ServiceImpl<ISysUserMapper, SysUser> imp
|
|
|
private RedisUtil redisUtil;
|
|
|
@Autowired
|
|
|
private IRepairLogService repairLogService;
|
|
|
+ @Autowired
|
|
|
+ ISysUserService sysUserService;
|
|
|
|
|
|
|
|
|
@Override
|
|
|
@@ -254,7 +258,12 @@ public class SysUserServiceImpl extends ServiceImpl<ISysUserMapper, SysUser> imp
|
|
|
List<Long> collect = roles.stream().map(SysRole::getId).collect(Collectors.toList());
|
|
|
LambdaQueryWrapper<SysUser> wrapper = new LambdaQueryWrapper<>();
|
|
|
wrapper.in(SysUser::getRoleId,collect);
|
|
|
- return this.list(wrapper);
|
|
|
+ List<SysUser> list = this.list(wrapper);
|
|
|
+ SysUser byId = sysUserService.getById((Long) StpUtil.getLoginId());
|
|
|
+ if(!list.stream().map(SysUser::getId).collect(Collectors.toList()).contains(byId.getId())){
|
|
|
+ list.add(byId);
|
|
|
+ }
|
|
|
+ return list;
|
|
|
}
|
|
|
|
|
|
@Override
|
lyhzzz