|
|
@@ -140,7 +140,14 @@ public class RescueInfoServiceImpl implements RescueInfoService {
|
|
|
|
|
|
@Override
|
|
|
public RescueInfoVO getRescueInfoById(String rescueId) {
|
|
|
- RescueInfo po = rescueInfoDao.selectById(rescueId);
|
|
|
+ String limitUser = null;
|
|
|
+ final String currentUserId = UserUtils.getCurrentUserId();
|
|
|
+ if (MyUserUtil.isSuperAdmin(currentUserId)) {
|
|
|
+ //超级管理员 拥有所有数据权限
|
|
|
+ }else{
|
|
|
+ limitUser = currentUserId;
|
|
|
+ }
|
|
|
+ RescueInfo po = rescueInfoDao.selectInfoById(rescueId,limitUser);
|
|
|
if (po == null) {
|
|
|
return null;
|
|
|
}
|
|
|
@@ -638,7 +645,7 @@ public class RescueInfoServiceImpl implements RescueInfoService {
|
|
|
}
|
|
|
String prefix = configService.getPubConfigValue(CommConstant.SRS_WEBRTC_PREFIX);
|
|
|
return prefix + CommConstant.STREAM_APP + "/" +
|
|
|
- eleDeviceInfoVO.getCamera1No() + "_" + eleDeviceInfoVO.getCamera1Channel();
|
|
|
+ cameraId + "_" + cameraNo;
|
|
|
}
|
|
|
|
|
|
@Override
|