|
@@ -85,6 +85,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
|
IJyUserService jyUserService;
|
|
|
@Autowired
|
|
|
IJySceneUserAuthService jySceneUserAuthService;
|
|
|
+ @Autowired
|
|
|
+ ISysUserService sysUserService;
|
|
|
|
|
|
|
|
|
@Override
|
|
@@ -296,12 +298,19 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
|
// if(param.getType() == 3){ //双目lite
|
|
|
// return sceneService.pageList(param);
|
|
|
// }
|
|
|
- JyUser jyUser = jyUserService.getBySysId(StpUtil.getLoginId());
|
|
|
- if(jyUser == null){
|
|
|
- throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
|
|
|
+ SysUser byId = sysUserService.getById(Long.valueOf(StpUtil.getLoginId().toString()));
|
|
|
+ JyUser jyUser = jyUserService.getBySysId(byId.getId());
|
|
|
+ if(byId.getRoleId() != 1){
|
|
|
+ if(jyUser == null){
|
|
|
+ throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
|
|
|
+ }
|
|
|
+ param.setUserId(jyUser.getUserId());
|
|
|
+ List<JySceneUserAuth> list = jySceneUserAuthService.getByJyUserId(jyUser.getId());
|
|
|
+ if(list.size() >0){
|
|
|
+ List<String> numList = list.stream().map(JySceneUserAuth::getNum).collect(Collectors.toList());
|
|
|
+ param.setAuthNumList(numList);
|
|
|
+ }
|
|
|
}
|
|
|
-
|
|
|
- param.setUserId(jyUser.getUserId());
|
|
|
Page<SceneVo> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
|
|
|
List<SceneVo> records = page.getRecords();
|
|
|
List<String> numList = records.parallelStream().map(SceneVo::getNum).collect(Collectors.toList());
|