|
@@ -45,6 +45,8 @@ public class JySceneUserAuthServiceImpl extends ServiceImpl<IJySceneUserAuthMapp
|
|
|
ISceneProService sceneProService;
|
|
|
@Autowired
|
|
|
IScenePlusService scenePlusService;
|
|
|
+ @Autowired
|
|
|
+ ISysUserService sysUserService;
|
|
|
|
|
|
@Override
|
|
|
public Object getAuthList(SceneParam param) {
|
|
@@ -153,12 +155,12 @@ public class JySceneUserAuthServiceImpl extends ServiceImpl<IJySceneUserAuthMapp
|
|
|
if(pro == null && plus == null){
|
|
|
throw new BusinessException(ResultCode.SCENE_NOT_EXITS);
|
|
|
}
|
|
|
- Object loginId = StpUtil.getLoginId();
|
|
|
- JyUser jyUser = jyUserService.getBySysId(loginId);
|
|
|
- if(pro != null && jyUser.getUserId().equals(pro.getUserId())){
|
|
|
+ SysUser byId = sysUserService.getById(Long.valueOf(StpUtil.getLoginId().toString()));
|
|
|
+ JyUser jyUser = jyUserService.getBySysId(byId.getId());
|
|
|
+ if( byId.getRoleId() != 1L && byId.getRoleId() !=45L || (pro != null && jyUser.getUserId().equals(pro.getUserId()))){
|
|
|
return true;
|
|
|
}
|
|
|
- if(plus != null && jyUser.getUserId().equals(plus.getUserId())){
|
|
|
+ if(byId.getRoleId() != 1L && byId.getRoleId() !=45L || (plus != null && jyUser.getUserId().equals(plus.getUserId()))){
|
|
|
return true;
|
|
|
}
|
|
|
|