fix: 修复权限 meta JSON 数据构建空值错误、equals 代码简化

basic-auth/src/main/java/com/yiring/auth/domain/permission/Permission.java

@@ -122,7 +122,9 @@ public class Permission extends BasicEntity implements Serializable {
         meta.put("icon", this.icon);
         meta.put("orderNo", this.serial);
         meta.put("hideMenu", this.hidden);
-        meta.putAll(this.meta);
+        if (this.meta != null) {
+            meta.putAll(this.meta);
+        }
         return meta;
     }
 
@@ -131,7 +133,7 @@ public class Permission extends BasicEntity implements Serializable {
         if (this == o) return true;
         if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false;
         Permission that = (Permission) o;
-        return this.getId() != null && Objects.equals(this.getId(), that.getId());
+        return getId() != null && Objects.equals(getId(), that.getId());
     }
 
     @Override

basic-auth/src/main/java/com/yiring/auth/domain/role/Role.java

@@ -73,7 +73,7 @@ public class Role extends BasicEntity implements Serializable {
         if (this == o) return true;
         if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false;
         Role role = (Role) o;
-        return this.getId() != null && Objects.equals(this.getId(), role.getId());
+        return getId() != null && Objects.equals(getId(), role.getId());
     }
 
     @Override

basic-auth/src/main/java/com/yiring/auth/domain/user/User.java

@@ -89,7 +89,7 @@ public class User extends BasicEntity implements Serializable {
         joinColumns = { @JoinColumn(name = "user_id") },
         inverseJoinColumns = { @JoinColumn(name = "role_id") }
     )
-    private Set<Role> roles = new HashSet<>();
+    Set<Role> roles = new HashSet<>();
 
     @Comment("最后登录IP地址")
     String lastLoginIp;
@@ -102,7 +102,7 @@ public class User extends BasicEntity implements Serializable {
         if (this == o) return true;
         if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false;
         User user = (User) o;
-        return this.getId() != null && Objects.equals(this.getId(), user.getId());
+        return getId() != null && Objects.equals(getId(), user.getId());
     }
 
     @Override