|
@@ -95,9 +95,6 @@ public class SceneService implements ISceneService {
|
|
param.setSnCodes(snCodes);
|
|
param.setSnCodes(snCodes);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- if(StringUtils.isBlank(param.getDeptId())){
|
|
|
|
- param.setDeptId("0");
|
|
|
|
- }
|
|
|
|
if(StringUtils.isNotBlank(param.getDeptId())){
|
|
if(StringUtils.isNotBlank(param.getDeptId())){
|
|
List<TmDepartment> sonByDeptId = tmDepartmentService.getSonByDeptId(param.getDeptId());
|
|
List<TmDepartment> sonByDeptId = tmDepartmentService.getSonByDeptId(param.getDeptId());
|
|
List<String> deptIds = sonByDeptId.stream().map(TmDepartment::getId).collect(Collectors.toList());
|
|
List<String> deptIds = sonByDeptId.stream().map(TmDepartment::getId).collect(Collectors.toList());
|
|
@@ -111,6 +108,12 @@ public class SceneService implements ISceneService {
|
|
snCodes = snCodes.stream().filter(snCodeSet::contains).collect(Collectors.toList());
|
|
snCodes = snCodes.stream().filter(snCodeSet::contains).collect(Collectors.toList());
|
|
}
|
|
}
|
|
param.setSnCodes(snCodes);
|
|
param.setSnCodes(snCodes);
|
|
|
|
+ }else {
|
|
|
|
+ if(StpUtil.hasRole("admin-super")){
|
|
|
|
+ List<TmCamera> tmCameras = tmCameraService.list();
|
|
|
|
+ Set<String> snCodeSet = tmCameras.parallelStream().map(TmCamera::getCameraSn).collect(Collectors.toSet());
|
|
|
|
+ param.setSnCodes(new ArrayList<>(snCodeSet));
|
|
|
|
+ }
|
|
}
|
|
}
|
|
if(StringUtils.isNotBlank(param.getSnCode())){
|
|
if(StringUtils.isNotBlank(param.getSnCode())){
|
|
List<String> snCodes = param.getSnCodes();
|
|
List<String> snCodes = param.getSnCodes();
|