Explorar o código

恢复企业id=26的判断

dengsixing hai 5 meses
pai
achega
5329d0ca04

+ 5 - 2
src/main/java/com/fdkankan/contro/service/impl/CommonServiceImpl.java

@@ -792,12 +792,15 @@ public class CommonServiceImpl implements ICommonService {
 
     @Override
     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"))){
             return false;
         }
         Integer location = dataFdageJson.getInteger("location");
-        if(location == 7){
+        Long companyId = cameraDetail.getCompanyId();
+        if(companyId == 26 && location == 7){
             return true;
         }
         return false;