Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/hikvision/util/Out_In_RecordUtil.java

@@ -397,18 +397,15 @@ public class Out_In_RecordUtil {
 
         String response = data;
 
-        JsonElement responseElement = new Gson().fromJson(response, JsonElement.class);
-        JsonArray dataList = responseElement.getAsJsonObject().getAsJsonObject("data").getAsJsonArray("list");
-
-        for (JsonElement item : dataList) {
-            responseBuilder.add(item);
-        }
-
-        JsonObject responseJson = new Gson().fromJson(response, JsonObject.class);
-        int totalCount = responseJson.getAsJsonObject("data").get("totalPage").getAsInt();
+        if (data != null){
+            JsonElement responseElement = new Gson().fromJson(response, JsonElement.class);
+            JsonArray dataList = responseElement.getAsJsonObject().getAsJsonObject("data").getAsJsonArray("list");
 
+            for (JsonElement item : dataList) {
+                responseBuilder.add(item);
+            }
 
-        // Process the records
-        InsertTeacherStudentRecords(use, responseBuilder, faceImportMapper);
+            InsertTeacherStudentRecords(use, responseBuilder, faceImportMapper);
+        }
     }
 }