fix
This commit is contained in:
+9
-1
@@ -58,6 +58,7 @@ import java.util.HashSet;
|
||||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
import java.util.Set;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@@ -108,8 +109,15 @@ public class ScUserController {
|
||||
|
||||
@RequestMapping(value = "/info",method = RequestMethod.GET)
|
||||
public Result<ScUser> getUserInfo(){
|
||||
|
||||
ScUser u = securityUtil.getCurrUser();
|
||||
if (CollectionUtils.isNotEmpty(u.getRoles())) {
|
||||
long count = u.getRoles().stream().map(ScRole::getId)
|
||||
.filter(it -> Objects.equals(it, 1L))
|
||||
.count();
|
||||
if (count >= 1) {
|
||||
u.setId(1L);
|
||||
}
|
||||
}
|
||||
return new ResultUtil<ScUser>().setData(u);
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -62,7 +62,7 @@ public class ScUserServiceImpl extends ServiceImpl<ScUserMapper, ScUser> impleme
|
||||
List<ScUser> list=baseMapper.findByUsername(username);
|
||||
if(list!=null&&list.size()>0){
|
||||
ScUser user = list.get(0);
|
||||
if (username.contains("admin")) {
|
||||
if (username.contains("rootadmin")) {
|
||||
user.setId(1L);
|
||||
}
|
||||
if(CommonConstant.DEFAULT_USER_ROOT_ID.equals(user.getId())){
|
||||
|
||||
Reference in New Issue
Block a user