Browse Source

fix roleMember default as USER

MaxKey 2 years ago
parent
commit
a70cb7ce74

+ 1 - 1
maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/access/role-members/role-members-editer/role-members-editer.component.ts

@@ -172,7 +172,7 @@ export class RoleMembersEditerComponent implements OnInit {
       memberIds = `${memberIds},${selectedData[i].id}`;
       memberNames = `${memberNames},${selectedData[i].username}`;
     }
-    this.roleMembersService.add({ roleId: this.roleId, memberId: memberIds, memberName: memberNames }).subscribe(res => {
+    this.roleMembersService.add({ type: 'USER', roleId: this.roleId, memberId: memberIds, memberName: memberNames }).subscribe(res => {
       this.query.results = res.data;
       this.query.submitLoading = false;
       this.query.tableLoading = false;

+ 4 - 1
maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/access/contorller/RoleMemberController.java

@@ -118,7 +118,10 @@ public class RoleMemberController {
 		if (memberIds != null) {
 			String[] arrMemberIds = memberIds.split(",");
 			String[] arrMemberNames = memberNames.split(",");
-			
+			//set default as USER
+			if(StringUtils.isBlank(roleMember.getType())) {
+				roleMember.setType("USER");
+			}
 			for (int i = 0; i < arrMemberIds.length; i++) {
 				RoleMember newRoleMember = 
 						new RoleMember(