|
|
@@ -1,9 +1,21 @@
|
|
|
package com.uas.sso.entity;
|
|
|
|
|
|
-import javax.persistence.*;
|
|
|
+import com.fasterxml.jackson.annotation.JsonIgnore;
|
|
|
import java.io.Serializable;
|
|
|
import java.sql.Timestamp;
|
|
|
+import java.util.HashSet;
|
|
|
import java.util.List;
|
|
|
+import java.util.Set;
|
|
|
+import javax.persistence.CascadeType;
|
|
|
+import javax.persistence.Column;
|
|
|
+import javax.persistence.Entity;
|
|
|
+import javax.persistence.FetchType;
|
|
|
+import javax.persistence.Id;
|
|
|
+import javax.persistence.JoinColumn;
|
|
|
+import javax.persistence.ManyToMany;
|
|
|
+import javax.persistence.OneToMany;
|
|
|
+import javax.persistence.OneToOne;
|
|
|
+import javax.persistence.Table;
|
|
|
|
|
|
/**
|
|
|
* 用户信息
|
|
|
@@ -182,6 +194,10 @@ public class User implements Serializable {
|
|
|
@JoinColumn(name = "useruu", nullable = false)
|
|
|
private List<UserQuestion> questions;
|
|
|
|
|
|
+ @JsonIgnore
|
|
|
+ @ManyToMany(mappedBy = "users")
|
|
|
+ private Set<Userspace> userSpaces = new HashSet<>();
|
|
|
+
|
|
|
public User() {
|
|
|
}
|
|
|
|
|
|
@@ -400,4 +416,12 @@ public class User implements Serializable {
|
|
|
public void setQuestions(List<UserQuestion> questions) {
|
|
|
this.questions = questions;
|
|
|
}
|
|
|
+
|
|
|
+ public Set<Userspace> getUserSpaces() {
|
|
|
+ return userSpaces;
|
|
|
+ }
|
|
|
+
|
|
|
+ public void setUserSpaces(Set<Userspace> userSpaces) {
|
|
|
+ this.userSpaces = userSpaces;
|
|
|
+ }
|
|
|
}
|