要判断空值

src/main/java/thyyxxk/webserver/utils/CampareObject.java

@@ -1,28 +1,23 @@
 package thyyxxk.webserver.utils;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import thyyxxk.webserver.entity.login.UserInfo;
 
 import java.util.*;
 
-public class CampareJson {
-    public static void main(String[] args) {
-        UserInfo tt = new UserInfo();
-        UserInfo dd = new UserInfo();
-        tt.setName("aaa").setSid("bbb").setDeptName("ccc").setToken("ddd").setCodeRs("erere").setDeptCode("qwer");
-        dd.setName("aaa").setSid("bcb").setDeptName("zxc").setToken("ddd").setCodeRs("erere").setDeptCode("qwesr");
-        System.out.println(new CampareJson().getChangedFieldsOfObject(tt, dd));
-    }
+public class CampareObject {
+
 
-    public List<String> getChangedFieldsOfObject(Object oldObj, Object newObj) {
+    public static List<String> getChangedFieldsOfObject(Object oldObj, Object newObj) {
         JSONObject oldJson = JSONObject.parseObject(JSON.toJSONString(oldObj));
         JSONObject newJson = JSONObject.parseObject(JSON.toJSONString(newObj));
         List<String> resultArray = new ArrayList<>();
         for (String key : oldJson.keySet()) {
-            if (!newJson.get(key).equals(oldJson.get(key))) {
-                resultArray.add(key);
+            if (null != newJson.get(key)) {
+                if (!newJson.get(key).equals(oldJson.get(key))) {
+                    resultArray.add(key);
+                }
             }
         }
         return resultArray;