TRX 1 tahun lalu
induk
melakukan
a8dcc464d2

+ 3 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/org/projectDict/ProjectDictSearch.java

@@ -28,4 +28,7 @@ public class ProjectDictSearch extends SuperSearch {
 
     @Schema(description = "状态")
     private DataState state;
+
+    @Schema(description = "")
+    private String keyWord;
 }

+ 3 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/org/role/RoleAddParam.java

@@ -29,6 +29,9 @@ public class RoleAddParam extends SuperParam {
     @Schema(description = "角色类型")
     private AuthType authType;
 
+    @Schema(description = "是否是游客角色")
+    private Boolean isVisitor = Boolean.FALSE;
+
     @NotNull
     @Schema(description = "状态")
     private DataState state = DataState.Enable;

+ 4 - 1
FullCardClient/src/main/java/com/zhongshu/card/client/model/org/role/RoleModel.java

@@ -34,7 +34,7 @@ public class RoleModel extends SuperModel {
     }
 
     @Schema(description = "角色类型")
-    RoleType roleType;
+    private RoleType roleType;
 
     private String roleTypeStr;
 
@@ -62,4 +62,7 @@ public class RoleModel extends SuperModel {
 
     @Schema(description = "是否管理角色")
     private Boolean isAdmin = Boolean.FALSE;
+
+    @Schema(description = "是否是游客角色")
+    private Boolean isVisitor = Boolean.FALSE;
 }

+ 1 - 1
FullCardClient/src/main/java/com/zhongshu/card/client/type/RoleType.java

@@ -3,7 +3,7 @@ package com.zhongshu.card.client.type;
 import lombok.Getter;
 
 /**
- * 用户类型
+ * 角色类型
  */
 public enum RoleType {
     BuildIn("系统内置"),

+ 0 - 31
FullCardClient/src/main/java/com/zhongshu/card/client/type/school/RoleDefaultType.java

@@ -1,31 +0,0 @@
-package com.zhongshu.card.client.type.school;
-
-import com.github.microservice.auth.security.type.AuthType;
-import lombok.Getter;
-
-/**
- * 默认角色配置
- */
-public enum RoleDefaultType {
-    Teacher("老师", "Teacher", AuthType.School),
-    Student("学生", "Student", AuthType.School),
-    ;
-
-    // 备注
-    @Getter
-    private String remark;
-
-    // 角色的身份标识
-    @Getter
-    private String identity;
-
-    // 所属机构类型
-    @Getter
-    private AuthType authType;
-
-    RoleDefaultType(String remark, String identity, AuthType authType) {
-        this.remark = remark;
-        this.identity = identity;
-        this.authType = authType;
-    }
-}