Skip to content

Commit

Permalink
Merge pull request #81 from fcfang123/issue-80
Browse files Browse the repository at this point in the history
feat:支持将分级管理员下用户组成员加入到二级管理员的用户组中 #80
  • Loading branch information
mingshewhe authored Nov 21, 2023
2 parents 8850029 + 9c411ad commit 02f8c17
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 5 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ ext {
set('lombokVersion', '1.18.10')
set("junitVersion", "5.4.2")

String iamVersion = (System.getProperty("iamVersion") ?: "1.0.40")
String iamVersion = (System.getProperty("iamVersion") ?: "1.0.41")
if (System.getProperty("snapshot") == "true") {
set('iamVersion', iamVersion + "-SNAPSHOT")
} else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public class GradeManagerApplicationCreateDTO {
private Boolean syncPerm;

/**
* 如果sync_perm为true, 可以自定义用户组名称, 默认为空
* 如果sync_perm为true, 可以自定义用户组名称, 默认为空
*/
@JsonProperty("group_name")
private String groupName;
Expand Down Expand Up @@ -82,4 +82,9 @@ public class GradeManagerApplicationCreateDTO {
* 透传到ITSM审批单的内容, 默认为空
* */
private ItsmContentDTO content;
/*
* 是否创建用户组的同步人员模版, 默认false
* */
@JsonProperty("sync_subject_template")
private Boolean syncSubjectTemplate;
}
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,13 @@ public class CreateManagerDTO {
Boolean sync_perm;

/**
* 如果sync_perm为true, 可以自定义用户组名称, 默认为空
* 如果sync_perm为true, 可以自定义用户组名称, 默认为空
*/
@JsonProperty("group_name")
private String groupName;
/**
* 是否创建用户组的同步人员模版, 默认false
*/
@JsonProperty("sync_subject_template")
private Boolean syncSubjectTemplate;
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,13 @@
public class ManagerRoleGroupDTO {
List<ManagerRoleGroup> groups;
/*
* 不传时默认为true,当迁移时,将该字段设置false,使得用户组可被管理
* */
* 不传时默认为true,当迁移时,将该字段设置false,使得用户组可被管理
* */
@JsonProperty("create_attributes")
Boolean createAttributes;
/*
* 是否创建用户组的同步人员模版, 默认false
* */
@JsonProperty("sync_subject_template")
Boolean syncSubjectTemplate;
}

0 comments on commit 02f8c17

Please sign in to comment.