|
@@ -13,8 +13,9 @@ import com.jzg.commons.entity.vo.SysRoleVo;
|
|
|
import com.jzg.commons.exception.SystemException;
|
|
import com.jzg.commons.exception.SystemException;
|
|
|
import com.jzg.commons.util.idgen.IdGenerate;
|
|
import com.jzg.commons.util.idgen.IdGenerate;
|
|
|
import com.jzg.mapper.*;
|
|
import com.jzg.mapper.*;
|
|
|
-import com.jzg.service.SysSystemService;
|
|
|
|
|
import com.jzg.service.UserRoleService;
|
|
import com.jzg.service.UserRoleService;
|
|
|
|
|
+import org.slf4j.Logger;
|
|
|
|
|
+import org.slf4j.LoggerFactory;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
@@ -27,11 +28,7 @@ import java.util.stream.Collectors;
|
|
|
@Service
|
|
@Service
|
|
|
public class UserRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> implements UserRoleService, HistoryDataService {
|
|
public class UserRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> implements UserRoleService, HistoryDataService {
|
|
|
|
|
|
|
|
- @Autowired
|
|
|
|
|
- SysSystemService sysSystemService;
|
|
|
|
|
-
|
|
|
|
|
- @Autowired
|
|
|
|
|
- SysMenuMapper sysMenuMapper;
|
|
|
|
|
|
|
+ private static final Logger log = LoggerFactory.getLogger(UserRoleServiceImpl.class);
|
|
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
|
SysRolePermsMapper sysRolePermsMapper;
|
|
SysRolePermsMapper sysRolePermsMapper;
|
|
@@ -57,11 +54,13 @@ public class UserRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> imp
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
public SysRoleVo roleGet(String roleId) {
|
|
public SysRoleVo roleGet(String roleId) {
|
|
|
|
|
+ log.info("查询角色的权限: roleId=[{}]",roleId);
|
|
|
String userSystemCode = baseController.getUserSystemCode();
|
|
String userSystemCode = baseController.getUserSystemCode();
|
|
|
SysRole sysRole = baseMapper.selectOne(new LambdaQueryWrapper<SysRole>()
|
|
SysRole sysRole = baseMapper.selectOne(new LambdaQueryWrapper<SysRole>()
|
|
|
.eq(SysRole::getId,roleId)
|
|
.eq(SysRole::getId,roleId)
|
|
|
.eq(SysRole::getSystemCode,userSystemCode));
|
|
.eq(SysRole::getSystemCode,userSystemCode));
|
|
|
if(Objects.isNull(sysRole)){
|
|
if(Objects.isNull(sysRole)){
|
|
|
|
|
+ log.info("根据租户代码[{}]和roleId[{}]没有找到角色信息",userSystemCode,roleId);
|
|
|
throw new SystemException("角色不存在");
|
|
throw new SystemException("角色不存在");
|
|
|
}
|
|
}
|
|
|
List<SysRolePerms> sysRolePerms = sysRolePermsMapper.getByRoleIdNew(roleId);
|
|
List<SysRolePerms> sysRolePerms = sysRolePermsMapper.getByRoleIdNew(roleId);
|
|
@@ -76,7 +75,7 @@ public class UserRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> imp
|
|
|
if (!sysRoleDataScope.equals("2")) {
|
|
if (!sysRoleDataScope.equals("2")) {
|
|
|
List<SysRoleDataScopeLink> sysRoleDataScopeLinks = sysRoleDataScopeLinkMapper.selectList(new LambdaQueryWrapper<SysRoleDataScopeLink>()
|
|
List<SysRoleDataScopeLink> sysRoleDataScopeLinks = sysRoleDataScopeLinkMapper.selectList(new LambdaQueryWrapper<SysRoleDataScopeLink>()
|
|
|
.eq(SysRoleDataScopeLink::getRoleId, roleId));
|
|
.eq(SysRoleDataScopeLink::getRoleId, roleId));
|
|
|
- vo.setDeptIds(sysRoleDataScopeLinks.stream().map(x -> x.getDeptId()).collect(Collectors.toList()));
|
|
|
|
|
|
|
+ vo.setDeptIds(sysRoleDataScopeLinks.stream().map(SysRoleDataScopeLink::getDeptId).collect(Collectors.toList()));
|
|
|
}
|
|
}
|
|
|
sysRoleVo.setDataScope(vo);
|
|
sysRoleVo.setDataScope(vo);
|
|
|
}
|
|
}
|