|
@@ -142,11 +142,16 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
|
param.setIsMigrate(false);
|
|
|
}
|
|
|
numList = tmContractorNumService.getNumListByCompanyId(user.getCompanyId());
|
|
|
- param.setCooperateSceneCodes(numList);
|
|
|
+ param.setCooperateSceneCodes(numList);
|
|
|
}
|
|
|
- Page<SceneVo> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
|
|
|
|
|
|
+ Page<SceneVo> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
|
|
|
List<String> sceneNumList = page.getRecords().stream().map(SceneVo::getNum).collect(Collectors.toList());
|
|
|
+ if(roleIds.contains(5L)){ //平台管理员
|
|
|
+ if(!sceneNumList.isEmpty()){
|
|
|
+ numList = tmContractorNumService.getNumList(sceneNumList);
|
|
|
+ }
|
|
|
+ }
|
|
|
HashMap<String,JSONObject> ssSceneMap = new HashMap<>();
|
|
|
if(param.getType() == 2){
|
|
|
ssSceneMap = laserService.list(sceneNumList);
|
|
@@ -175,10 +180,12 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
|
record.setIsMain(param.getIsMain());
|
|
|
record.setIsDownload(param.getIsDownload());
|
|
|
record.setIsMigrate(param.getIsMigrate());
|
|
|
- if(numList != null && numList.contains(record.getNum())){
|
|
|
+ if(!roleIds.contains(5L) && numList != null && numList.contains(record.getNum())){
|
|
|
record.setIsMain(false);
|
|
|
record.setIsDel(false);
|
|
|
record.setIsDownload(false);
|
|
|
+ }
|
|
|
+ if(!roleIds.contains(5L)){
|
|
|
record.setIsMigrate(false);
|
|
|
}
|
|
|
if(coldMap.get(record.getNum())!=null){
|