【fix sonar】OnlColumn文件

jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/model/OnlColumn.java

@@ -1,6 +1,8 @@
 
 package com.jero.generater.modules.online.cgform.model;
 
+import java.util.Objects;
+
 public class OnlColumn {
     private String title;
     private String dataIndex;
@@ -98,89 +100,60 @@ public class OnlColumn {
             } else if (this.isSorter() != var2.isSorter()) {
                 return false;
             } else {
-                label88: {
+                return getOnColumn(var2);
-                    String var3 = this.getTitle();
-                    String var4 = var2.getTitle();
-                    if (var3 == null) {
-                        if (var4 == null) {
-                            break label88;
-                        }
-                    } else if (var3.equals(var4)) {
-                        break label88;
-                    }
-
-                    return false;
-                }
-
-                String var5 = this.getDataIndex();
-                String var6 = var2.getDataIndex();
-                if (var5 == null) {
-                    if (var6 != null) {
-                        return false;
-                    }
-                } else if (!var5.equals(var6)) {
-                    return false;
-                }
-
-                label74: {
-                    String var7 = this.getAlign();
-                    String var8 = var2.getAlign();
-                    if (var7 == null) {
-                        if (var8 == null) {
-                            break label74;
-                        }
-                    } else if (var7.equals(var8)) {
-                        break label74;
-                    }
-
-                    return false;
-                }
-
-                label67: {
-                    String var9 = this.getCustomRender();
-                    String var10 = var2.getCustomRender();
-                    if (var9 == null) {
-                        if (var10 == null) {
-                            break label67;
-                        }
-                    } else if (var9.equals(var10)) {
-                        break label67;
-                    }
-
-                    return false;
-                }
-
-                ScopedSlots var11 = this.getScopedSlots();
-                ScopedSlots var12 = var2.getScopedSlots();
-                if (var11 == null) {
-                    if (var12 != null) {
-                        return false;
-                    }
-                } else if (!var11.equals(var12)) {
-                    return false;
-                }
-
-                String var13 = this.getHrefSlotName();
-                String var14 = var2.getHrefSlotName();
-                if (var13 == null) {
-                    if (var14 != null) {
-                        return false;
-                    }
-                } else if (!var13.equals(var14)) {
-                    return false;
-                }
-
-                return true;
             }
         }
     }
 
+    private boolean getOnColumn(OnlColumn var2) {
+        if (getReturn(this.getTitle(), var2.getTitle())) {
+            return false;
+        }
+
+        if (getReturn(this.getDataIndex(), var2.getDataIndex())) {
+            return false;
+        }
+
+        if (getReturn(this.getAlign(), var2.getAlign())) {
+            return false;
+        }
+
+
+        if (getReturn(this.getCustomRender(), var2.getCustomRender())) {
+            return false;
+        }
+
+        ScopedSlots var11 = this.getScopedSlots();
+        ScopedSlots var12 = var2.getScopedSlots();
+        if (var11 == null) {
+            if (var12 != null) {
+                return false;
+            }
+        } else if (!Objects.equals(var11,var12)) {
+            return false;
+        }
+
+        return !getReturn(this.getHrefSlotName(), var2.getHrefSlotName());
+    }
+
+    private boolean getReturn(String title, String title2) {
+        String var3 = title;
+        String var4 = title2;
+        if (var3 == null) {
+            if (var4 != null) {
+                return true;
+            }
+        } else if (!Objects.equals(var3, var4)) {
+            return true;
+        }
+        return false;
+    }
+
     protected boolean canEqual(Object other) {
         return other instanceof OnlColumn;
     }
 
     public int hashCode() {
-        boolean var1 = true;
         byte var2 = 1;
         int var9 = var2 * 59 + this.getShowLength();
         var9 = var9 * 59 + (this.isSorter() ? 79 : 97);