brealinxx 9 달 전
부모
커밋
5302c9ee9a

+ 1 - 1
src/main/java/com/xjrsoft/module/hikvision/util/ApiUtil.java

@@ -70,7 +70,7 @@ public class ApiUtil {
         if (uri != null)
             return "https://" + ApiUtil.host + "/" + uri;
         else
-            return null;
+            return "";
     }
 
 }

+ 4 - 0
src/main/java/com/xjrsoft/module/hikvision/util/Out_In_RecordUtil.java

@@ -415,11 +415,13 @@ public class Out_In_RecordUtil {
             String phone = faceImportMapper.GetPhoneNumberByPlanNum(plateNo);
             if (phone == null){
                 phone = faceImportMapper.GetPhoneNumberByPlanNumView(plateNo);
+                if (phone == null) phone = "";
             }
 
             String name = faceImportMapper.GetNameByPlanNum(plateNo);
             if (name == null){
                 name = faceImportMapper.GetNameByPlanNumView(plateNo);
+                if (name == null) name = "";
             }
 
             if(vehicle_id_list.contains(crossRecordSyscode)) continue;
@@ -552,11 +554,13 @@ public class Out_In_RecordUtil {
                     String phone = faceImportMapper.GetPhoneNumberByPlanNum(carNum);
                     if (phone == null){
                         phone = faceImportMapper.GetPhoneNumberByPlanNumView(carNum);
+                        if (phone == null) phone = "";
                     }
 
                     String name = faceImportMapper.GetNameByPlanNum(carNum);
                     if (name == null){
                         name = faceImportMapper.GetNameByPlanNumView(carNum);
+                        if (name == null) name = "";
                     }
 
                     if (vehicle_id_list.contains(eventIndex)) continue;