admin/MaxKey
1
0
Fork 0
mirror of https://gitee.com/dromara/MaxKey.git synced 2025-12-07 17:38:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复用户组bug

Browse Source
This commit is contained in:
MaxKey 2023-09-15 22:08:37 +08:00
parent 77182946e0
commit 32656d5aa5
11 changed files with 196 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
maxkey-core/src/main/java/org/dromara/maxkey/entity/GroupMember.java
View File

@ -26,7 +26,7 @@ import jakarta.persistence.Id;
import jakarta.persistence.Table; import jakarta.persistence.Table;
@Entity @Entity
@Table(name = "MXK_ROLE_MEMBER") @Table(name = "mxk_group_member")
public class GroupMember extends UserInfo implements Serializable{ public class GroupMember extends UserInfo implements Serializable{
/** /**

2
maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/GroupMemberService.java
View File

@ -80,7 +80,7 @@ public class GroupMemberService extends JpaService<GroupMember>{
if(entity.getPageNumber() == 1 && totalPage < entity.getPageSize()) { if(entity.getPageNumber() == 1 && totalPage < entity.getPageSize()) {
totalCount = totalPage; totalCount = totalPage;
}else { }else {
totalCount = parseCount(getMapper().fetchPageResults(entity)); totalCount = parseCount(getMapper().fetchCount(entity));
} }
return new JpaPageResults<Groups>(entity.getPageNumber(),entity.getPageSize(),totalPage,totalCount,resultslist); return new JpaPageResults<Groups>(entity.getPageNumber(),entity.getPageSize(),totalPage,totalCount,resultslist);

62
maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/group-members/member-groups-editer/member-groups-editer.component.html
View File

@ -3,52 +3,72 @@
<div nz-row [nzGutter]="{ xs: 8, sm: 8, md: 8, lg: 24, xl: 48, xxl: 48 }"> <div nz-row [nzGutter]="{ xs: 8, sm: 8, md: 8, lg: 24, xl: 48, xxl: 48 }">
<div nz-col nzMd="14" nzSm="24"> <div nz-col nzMd="14" nzSm="24">
<nz-form-item> <nz-form-item>
<nz-form-label nzFor="name">{{ 'mxk.roles.name' | i18n }}</nz-form-label> <nz-form-label nzFor="name">{{ 'mxk.groups.name' | i18n }}</nz-form-label>
<nz-form-control> <nz-form-control>
<input nz-input [(ngModel)]="query.params.groupName" [ngModelOptions]="{ standalone: true }" name="groupName" <input
placeholder="" id="groupName" /> nz-input
[(ngModel)]="query.params.groupName"
[ngModelOptions]="{ standalone: true }"
name="groupName"
placeholder=""
id="groupName"
/>
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>
</div> </div>
<div nz-col [nzSpan]="query.expandForm ? 24 : 10" [class.text-right]="query.expandForm"> <div nz-col [nzSpan]="query.expandForm ? 24 : 10" [class.text-right]="query.expandForm">
<button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query' | i18n <button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query' | i18n }}</button>
}}</button> <button nz-button type="reset" (click)="onReset()" class="mx-sm" style="display: none">{{ 'mxk.text.reset' | i18n }}</button>
<button nz-button type="reset" (click)="onReset()" class="mx-sm" style="display: none">{{ 'mxk.text.reset' | i18n
}}</button>
<button nz-button (click)="query.expandForm = !query.expandForm" class="mx-sm" style="display: none"> <button nz-button (click)="query.expandForm = !query.expandForm" class="mx-sm" style="display: none">
{{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}</button> {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}</button
>
<button nz-button nzType="primary" (click)="onSubmit($event)">{{ 'mxk.text.confirm' | i18n }}</button> <button nz-button nzType="primary" (click)="onSubmit($event)">{{ 'mxk.text.confirm' | i18n }}</button>
</div> </div>
</div> </div>
</form> </form>
<nz-table #dynamicTable nzTableLayout="auto" nzSize="small" nzBordered nzShowSizeChanger [nzData]="query.results.rows" <nz-table
[nzFrontPagination]="false" [nzTotal]="query.results.records" [nzPageSizeOptions]="query.params.pageSizeOptions" #dynamicTable
[nzPageSize]="query.params.pageSize" [nzPageIndex]="query.params.pageNumber" [nzLoading]="this.query.tableLoading" nzTableLayout="auto"
(nzQueryParams)="onQueryParamsChange($event)" nzWidth="100%"> nzSize="small"
nzBordered
nzShowSizeChanger
[nzData]="query.results.rows"
[nzFrontPagination]="false"
[nzTotal]="query.results.records"
[nzPageSizeOptions]="query.params.pageSizeOptions"
[nzPageSize]="query.params.pageSize"
[nzPageIndex]="query.params.pageNumber"
[nzLoading]="this.query.tableLoading"
(nzQueryParams)="onQueryParamsChange($event)"
nzWidth="100%"
>
<thead> <thead>
<tr> <tr>
<th></th> <th></th>
<th nzAlign="center" style="display: none">Id</th> <th nzAlign="center" style="display: none">Id</th>
<th nzAlign="center">{{ 'mxk.roles.name' | i18n }}</th> <th nzAlign="center">{{ 'mxk.groups.name' | i18n }}</th>
<th nzAlign="center">{{ 'mxk.roles.category' | i18n }}</th> <th nzAlign="center">{{ 'mxk.groups.category' | i18n }}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr *ngFor="let data of query.results.rows"> <tr *ngFor="let data of query.results.rows">
<td [nzChecked]="query.tableCheckedId.has(data.id)" [nzDisabled]="data.disabled" <td
(nzCheckedChange)="onTableItemChecked(data.id, $event)"></td> [nzChecked]="query.tableCheckedId.has(data.id)"
[nzDisabled]="data.disabled"
(nzCheckedChange)="onTableItemChecked(data.id, $event)"
></td>
<td nzAlign="left" style="display: none"> <td nzAlign="left" style="display: none">
<span>{{ data.id }}</span> <span>{{ data.id }}</span>
</td> </td>
<td nzAlign="left"> {{ data.roleName }}</td> <td nzAlign="left"> {{ data.groupName }}</td>
<td nzAlign="center" *ngIf="data.category == 'dynamic'"> {{ 'mxk.roles.category.dynamic' | i18n }}</td> <td nzAlign="center" *ngIf="data.category == 'dynamic'"> {{ 'mxk.groups.category.dynamic' | i18n }}</td>
<td nzAlign="center" *ngIf="data.category == 'static'"> {{ 'mxk.roles.category.static' | i18n }}</td> <td nzAlign="center" *ngIf="data.category == 'static'"> {{ 'mxk.groups.category.static' | i18n }}</td>
<td nzAlign="center" *ngIf="data.category == 'app'"> {{ 'mxk.roles.category.app' | i18n }}</td> <td nzAlign="center" *ngIf="data.category == 'app'"> {{ 'mxk.groups.category.app' | i18n }}</td>
</tr> </tr>
</tbody> </tbody>
</nz-table> </nz-table>
<div *nzModalFooter style="display: none"> <div *nzModalFooter style="display: none">
<button nz-button nzType="default" (click)="onClose($event)">{{ 'mxk.text.close' | i18n }}</button> <button nz-button nzType="default" (click)="onClose($event)">{{ 'mxk.text.close' | i18n }}</button>
<button nz-button nzType="primary" (click)="onSubmit($event)">{{ 'mxk.text.submit' | i18n }}</button> <button nz-button nzType="primary" (click)="onSubmit($event)">{{ 'mxk.text.submit' | i18n }}</button>
</div> </div>

10
maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/group-members/member-groups-editer/member-groups-editer.component.ts
View File

@ -162,13 +162,13 @@ export class MemberGroupsEditerComponent implements OnInit {
let selectedData = listOfEnabledData.filter(({ id, name }) => { let selectedData = listOfEnabledData.filter(({ id, name }) => {
return this.query.tableCheckedId.has(id); return this.query.tableCheckedId.has(id);
}); });
let roleIds = ''; let groupIds = '';
let roleNames = ''; let groupNames = '';
for (let i = 0; i < selectedData.length; i++) { for (let i = 0; i < selectedData.length; i++) {
roleIds = `${roleIds},${selectedData[i].id}`; groupIds = `${groupIds},${selectedData[i].id}`;
roleNames = `${roleNames},${selectedData[i].name}`; groupNames = `${groupNames},${selectedData[i].name}`;
} }
this.groupMembersService.addMember2Roles({ username: this.username, roleId: roleIds, roleName: roleNames }).subscribe(res => { this.groupMembersService.addMember2Groups({ username: this.username, groupId: groupIds, groupName: groupNames }).subscribe(res => {
this.query.results = res.data; this.query.results = res.data;
this.query.submitLoading = false; this.query.submitLoading = false;
this.query.tableLoading = false; this.query.tableLoading = false;

87
maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/users/users.component.html
View File

@ -7,18 +7,23 @@
<nz-form-item> <nz-form-item>
<nz-form-label nzFor="name">{{ 'mxk.users.username' | i18n }}</nz-form-label> <nz-form-label nzFor="name">{{ 'mxk.users.username' | i18n }}</nz-form-label>
<nz-form-control> <nz-form-control>
<input nz-input [(ngModel)]="query.params.username" [ngModelOptions]="{ standalone: true }" name="username" <input
placeholder="" id="username" /> nz-input
[(ngModel)]="query.params.username"
[ngModelOptions]="{ standalone: true }"
name="username"
placeholder=""
id="username"
/>
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>
</div> </div>
<div nz-col [nzSpan]="query.expandForm ? 24 : 8" [class.text-right]="query.expandForm"> <div nz-col [nzSpan]="query.expandForm ? 24 : 8" [class.text-right]="query.expandForm">
<button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query' | <button nz-button type="submit" [nzType]="'primary'" [nzLoading]="query.submitLoading">{{ 'mxk.text.query' | i18n }}</button>
i18n }}</button> <button nz-button type="reset" (click)="onReset()" class="mx-sm" style="display: none">{{ 'mxk.text.reset' | i18n }}</button>
<button nz-button type="reset" (click)="onReset()" class="mx-sm" style="display: none">{{ 'mxk.text.reset' |
i18n }}</button>
<button nz-button (click)="query.expandForm = !query.expandForm" class="mx-sm" style="display: none"> <button nz-button (click)="query.expandForm = !query.expandForm" class="mx-sm" style="display: none">
{{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}</button> {{ query.expandForm ? ('mxk.text.collapse' | i18n) : ('mxk.text.expand' | i18n) }}</button
>
</div> </div>
</div> </div>
</form> </form>
@ -37,8 +42,15 @@
</button> </button>
</div> </div>
<div nz-col [nzSpan]="6" class="grid-border"> <div nz-col [nzSpan]="6" class="grid-border">
<nz-tree nzShowLine="false" [nzCheckable]="treeNodes.checkable" nzBlockNode [nzData]="treeNodes.nodes" <nz-tree
(nzClick)="activeNode($event)" (nzDblClick)="openFolder($event)" [nzTreeTemplate]="nzTreeTemplate"></nz-tree> nzShowLine="false"
[nzCheckable]="treeNodes.checkable"
nzBlockNode
[nzData]="treeNodes.nodes"
(nzClick)="activeNode($event)"
(nzDblClick)="openFolder($event)"
[nzTreeTemplate]="nzTreeTemplate"
></nz-tree>
<ng-template #nzTreeTemplate let-node let-origin="origin"> <ng-template #nzTreeTemplate let-node let-origin="origin">
<span class="custom-node"> <span class="custom-node">
<span *ngIf="!node.isLeaf" (contextmenu)="contextMenu($event, menu)"> <span *ngIf="!node.isLeaf" (contextmenu)="contextMenu($event, menu)">
@ -59,15 +71,26 @@
</nz-dropdown-menu> </nz-dropdown-menu>
</div> </div>
<div nz-col nzMd="18" nzSm="24" class="grid-border"> <div nz-col nzMd="18" nzSm="24" class="grid-border">
<nz-table #dynamicTable nzTableLayout="auto" nzSize="small" nzBordered sizeChanger="true" nzShowSizeChanger <nz-table
[nzData]="query.results.rows" [nzFrontPagination]="false" [nzTotal]="query.results.records" #dynamicTable
[nzPageSizeOptions]="query.params.pageSizeOptions" [nzPageSize]="query.params.pageSize" nzTableLayout="auto"
[nzPageIndex]="query.params.pageNumber" [nzLoading]="this.query.tableLoading" nzSize="small"
(nzQueryParams)="onQueryParamsChange($event)" nzWidth="100%"> nzBordered
sizeChanger="true"
nzShowSizeChanger
[nzData]="query.results.rows"
[nzFrontPagination]="false"
[nzTotal]="query.results.records"
[nzPageSizeOptions]="query.params.pageSizeOptions"
[nzPageSize]="query.params.pageSize"
[nzPageIndex]="query.params.pageNumber"
[nzLoading]="this.query.tableLoading"
(nzQueryParams)="onQueryParamsChange($event)"
nzWidth="100%"
>
<thead> <thead>
<tr> <tr>
<th [nzChecked]="query.checked" [nzIndeterminate]="query.indeterminate" <th [nzChecked]="query.checked" [nzIndeterminate]="query.indeterminate" (nzCheckedChange)="onTableAllChecked($event)"></th>
(nzCheckedChange)="onTableAllChecked($event)"></th>
<th nzAlign="center" style="display: none">{{ 'mxk.text.id' | i18n }}</th> <th nzAlign="center" style="display: none">{{ 'mxk.text.id' | i18n }}</th>
<th nzAlign="center">{{ 'mxk.users.username' | i18n }}</th> <th nzAlign="center">{{ 'mxk.users.username' | i18n }}</th>
<th nzAlign="center">{{ 'mxk.users.displayName' | i18n }}</th> <th nzAlign="center">{{ 'mxk.users.displayName' | i18n }}</th>
@ -81,8 +104,11 @@
</thead> </thead>
<tbody> <tbody>
<tr *ngFor="let data of query.results.rows"> <tr *ngFor="let data of query.results.rows">
<td [nzChecked]="query.tableCheckedId.has(data.id)" [nzDisabled]="data.disabled" <td
(nzCheckedChange)="onTableItemChecked(data.id, $event)"></td> [nzChecked]="query.tableCheckedId.has(data.id)"
[nzDisabled]="data.disabled"
(nzCheckedChange)="onTableItemChecked(data.id, $event)"
></td>
<td nzAlign="left" style="display: none"> <td nzAlign="left" style="display: none">
<span>{{ data.id }}</span> <span>{{ data.id }}</span>
</td> </td>
@ -91,8 +117,7 @@
<td nzAlign="left"> {{ data.employeeNumber }}</td> <td nzAlign="left"> {{ data.employeeNumber }}</td>
<td nzAlign="left"> {{ data.department }}</td> <td nzAlign="left"> {{ data.department }}</td>
<td nzAlign="left"> {{ data.jobTitle }}</td> <td nzAlign="left"> {{ data.jobTitle }}</td>
<td nzAlign="center"> {{ data.gender == 1 ? ('mxk.users.gender.female' | i18n) : ('mxk.users.gender.male' | <td nzAlign="center"> {{ data.gender == 1 ? ('mxk.users.gender.female' | i18n) : ('mxk.users.gender.male' | i18n) }}</td>
i18n) }}</td>
<td nzAlign="center"> <td nzAlign="center">
<a title="{{ 'mxk.users.status.active' | i18n }}" *ngIf="data.status == 1"> <a title="{{ 'mxk.users.status.active' | i18n }}" *ngIf="data.status == 1">
<i nz-icon nzType="check-circle" nzTheme="fill" style="color: green"> </i> <i nz-icon nzType="check-circle" nzTheme="fill" style="color: green"> </i>
@ -125,27 +150,25 @@
</button> </button>
<nz-dropdown-menu #menuMoreAction="nzDropdownMenu"> <nz-dropdown-menu #menuMoreAction="nzDropdownMenu">
<ul nz-menu> <ul nz-menu>
<li nz-menu-item *ngIf="data.status == 1" <li nz-menu-item *ngIf="data.status == 1" (click)="onNavToUrl($event, data.id, data.username, 'groups')">{{
(click)="onNavToUrl($event, data.id, data.username, 'roles')">{{ 'mxk.text.groups' | i18n
'mxk.text.roles' | i18n }}</li>
}}</li>
<li nz-menu-item *ngIf="data.status == 1" (click)="changePasswordById($event, data.id)">{{ <li nz-menu-item *ngIf="data.status == 1" (click)="changePasswordById($event, data.id)">{{
'mxk.text.changepassword' | i18n 'mxk.text.changepassword' | i18n
}}</li> }}</li>
<li nz-menu-item *ngIf="data.status == 1" (click)="onUpdateStatus($event, data.id, 5)">{{ <li nz-menu-item *ngIf="data.status == 1" (click)="onUpdateStatus($event, data.id, 5)">{{ 'mxk.text.lock' | i18n }}</li>
'mxk.text.lock' | i18n }}</li>
<li nz-menu-item *ngIf="data.status == 1" (click)="onUpdateStatus($event, data.id, 4)">{{ <li nz-menu-item *ngIf="data.status == 1" (click)="onUpdateStatus($event, data.id, 4)">{{
'mxk.text.disable' | i18n 'mxk.text.disable' | i18n
}}</li> }}</li>
<li nz-menu-item *ngIf="data.status == 2" (click)="onUpdateStatus($event, data.id, 1)">{{ <li nz-menu-item *ngIf="data.status == 2" (click)="onUpdateStatus($event, data.id, 1)">{{
'mxk.text.enable' | i18n 'mxk.text.enable' | i18n
}}</li> }}</li>
<li nz-menu-item *ngIf="data.status == 4" (click)="onUpdateStatus($event, data.id, 1)">{{ <li nz-menu-item *ngIf="data.status == 4" (click)="onUpdateStatus($event, data.id, 1)">{{
'mxk.text.enable' | i18n 'mxk.text.enable' | i18n
}}</li> }}</li>
<li nz-menu-item *ngIf="data.status == 5" (click)="onUpdateStatus($event, data.id, 1)">{{ <li nz-menu-item *ngIf="data.status == 5" (click)="onUpdateStatus($event, data.id, 1)">{{
'mxk.text.unlock' | i18n 'mxk.text.unlock' | i18n
}}</li> }}</li>
<li nz-menu-item (click)="onDelete($event, data.id)" nzDanger>{{ 'mxk.text.delete' | i18n }}</li> <li nz-menu-item (click)="onDelete($event, data.id)" nzDanger>{{ 'mxk.text.delete' | i18n }}</li>
</ul> </ul>
</nz-dropdown-menu> </nz-dropdown-menu>
@ -156,4 +179,4 @@
</nz-table> </nz-table>
</div> </div>
</div> </div>
</nz-card> </nz-card>

4
maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/users/users.component.ts
View File

@ -221,8 +221,8 @@ export class UsersComponent implements OnInit {
onNavToUrl(e: MouseEvent, userId: String, username: String, navType: String) { onNavToUrl(e: MouseEvent, userId: String, username: String, navType: String) {
e.preventDefault(); e.preventDefault();
if (navType === 'roles') { if (navType === 'groups') {
this.router.navigateByUrl(`/access/rolemembers?username=${username}&userId=${userId}`); this.router.navigateByUrl(`/idm/groupmembers?username=${username}&userId=${userId}`);
} }
} }

2
maxkey-web-frontend/maxkey-web-mgt-app/src/app/service/group-members.service.ts
View File

@ -40,7 +40,7 @@ export class GroupMembersService extends BaseService<GroupMembers> {
}); });
} }
addMember2Roles(body: any): Observable<Message<PageResults>> { addMember2Groups(body: any): Observable<Message<PageResults>> {
return this.http.post<Message<PageResults>>(`${`${this.server.urls.base}/addMember2Groups`}`, body); return this.http.post<Message<PageResults>>(`${`${this.server.urls.base}/addMember2Groups`}`, body);
} }
} }

22
maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/en-US.json
View File

@ -505,6 +505,28 @@
"suspendTime": "Suspend Time", "suspendTime": "Suspend Time",
"isdefault": "Is Default" "isdefault": "Is Default"
}, },
"groups": {
"name": "Group Name",
"type": {
"":"Member Type",
"user":"User",
"user-dynamic":"User-Dynamic",
"post":"Post"
},
"member": "Member",
"permissions": "Permissions",
"category": {
"":"Category",
"dynamic":"Dynamic",
"static":"Static",
"app":"App"
},
"filters": "Attributes Filter",
"orgIdsList": "Dept List",
"resumeTime": "Join Time",
"suspendTime": "Suspend Time",
"isdefault": "Is Default"
},
"resources": { "resources": {
"id": "ID", "id": "ID",
"name": "Resource", "name": "Resource",

22
maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/zh-CN.json
View File

@ -503,6 +503,28 @@
"suspendTime": "挂起时间", "suspendTime": "挂起时间",
"isdefault": "是否默认角色" "isdefault": "是否默认角色"
}, },
"groups": {
"name": "用户组名称",
"type": {
"":"成员类型",
"user":"用户",
"user-dynamic":"用户-动态",
"post":"岗位"
},
"member": "成员",
"permissions": "访问权限",
"category": {
"":"类型",
"dynamic":"动态",
"static":"静态",
"app":"应用"
},
"filters": "属性过滤器",
"orgIdsList": "部门列表",
"resumeTime": "加入时间",
"suspendTime": "挂起时间",
"isdefault": "是否默认角色"
},
"resources": { "resources": {
"id": "资源编码", "id": "资源编码",
"name": "资源名称", "name": "资源名称",

22
maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/zh-TW.json
View File

@ -504,6 +504,28 @@
"suspendTime": "掛起時間", "suspendTime": "掛起時間",
"isdefault": "是否默認角色" "isdefault": "是否默認角色"
}, },
"groups": {
"name": "用戶组名稱",
"type": {
"":"成員類型",
"user":"用戶",
"user-dynamic":"用戶-動態",
"post":"崗位"
},
"member": "成員",
"permissions": "存取控制",
"category": {
"":"類型",
"dynamic":"動態",
"static":"靜態",
"app":"應用"
},
"filters": "屬性過濾器",
"orgIdsList": "部門列表",
"resumeTime": "加入時間",
"suspendTime": "掛起時間",
"isdefault": "是否默認角色"
},
"resources": { "resources": {
"id": "資源編碼", "id": "資源編碼",
"name": "資源名稱", "name": "資源名稱",

44
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/GroupMemberController.java
View File

@ -123,16 +123,18 @@ public class GroupMemberController {
groupMember.setType("USER"); groupMember.setType("USER");
} }
for (int i = 0; i < arrMemberIds.length; i++) { for (int i = 0; i < arrMemberIds.length; i++) {
GroupMember newGroupMember = if(StringUtils.isNotBlank(arrMemberIds[i])) {
new GroupMember( GroupMember newGroupMember =
groupId, new GroupMember(
groupMember.getGroupName(), groupId,
arrMemberIds[i], groupMember.getGroupName(),
arrMemberNames[i], arrMemberIds[i],
groupMember.getType(), arrMemberNames[i],
currentUser.getInstId()); groupMember.getType(),
newGroupMember.setId(WebContext.genId()); currentUser.getInstId());
result = service.insert(newGroupMember); newGroupMember.setId(WebContext.genId());
result = service.insert(newGroupMember);
}
} }
if(result) { if(result) {
return new Message<GroupMember>(Message.SUCCESS).buildResponse(); return new Message<GroupMember>(Message.SUCCESS).buildResponse();
@ -164,16 +166,18 @@ public class GroupMemberController {
String[] arrGroupNames = groupNames.split(","); String[] arrGroupNames = groupNames.split(",");
for (int i = 0; i < arrGroupIds.length; i++) { for (int i = 0; i < arrGroupIds.length; i++) {
GroupMember newGroupMember = if(StringUtils.isNotBlank(arrGroupIds[i])) {
new GroupMember( GroupMember newGroupMember =
arrGroupIds[i], new GroupMember(
arrGroupNames[i], arrGroupIds[i],
userInfo.getId(), arrGroupNames[i],
userInfo.getDisplayName(), userInfo.getId(),
"USER", userInfo.getDisplayName(),
currentUser.getInstId()); "USER",
newGroupMember.setId(WebContext.genId()); currentUser.getInstId());
result = service.insert(newGroupMember); newGroupMember.setId(WebContext.genId());
result = service.insert(newGroupMember);
}
} }
if(result) { if(result) {
return new Message<GroupMember>(Message.SUCCESS).buildResponse(); return new Message<GroupMember>(Message.SUCCESS).buildResponse();