|
@@ -792,12 +792,15 @@ public class CommonServiceImpl implements ICommonService {
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public boolean checkIsSpVr(JSONObject dataFdageJson, CameraDetail cameraDetail) {
|
|
public boolean checkIsSpVr(JSONObject dataFdageJson, CameraDetail cameraDetail) {
|
|
- if(Objects.isNull(dataFdageJson)
|
|
|
|
|
|
+ if(Objects.isNull(cameraDetail)
|
|
|
|
+ || Objects.isNull(cameraDetail.getCompanyId())
|
|
|
|
+ || Objects.isNull(dataFdageJson)
|
|
|| Objects.isNull(dataFdageJson.getInteger("location"))){
|
|
|| Objects.isNull(dataFdageJson.getInteger("location"))){
|
|
return false;
|
|
return false;
|
|
}
|
|
}
|
|
Integer location = dataFdageJson.getInteger("location");
|
|
Integer location = dataFdageJson.getInteger("location");
|
|
- if(location == 7){
|
|
|
|
|
|
+ Long companyId = cameraDetail.getCompanyId();
|
|
|
|
+ if(companyId == 26 && location == 7){
|
|
return true;
|
|
return true;
|
|
}
|
|
}
|
|
return false;
|
|
return false;
|