From 8aac7a7bb5055a88b669056c73c93de934070dc6 Mon Sep 17 00:00:00 2001 From: MaxKey Date: Thu, 30 Jun 2022 08:42:46 +0800 Subject: [PATCH] addMember2Roles --- .../maxkey-web-app/src/app/shared/consts.ts | 2 +- .../contorller/RoleMemberController.java | 20 +++++++++++++++---- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/maxkey-web-frontend/maxkey-web-app/src/app/shared/consts.ts b/maxkey-web-frontend/maxkey-web-app/src/app/shared/consts.ts index ffcdfc79..036ee833 100644 --- a/maxkey-web-frontend/maxkey-web-app/src/app/shared/consts.ts +++ b/maxkey-web-frontend/maxkey-web-app/src/app/shared/consts.ts @@ -21,5 +21,5 @@ export const CONSTS = { REDIRECT_URI: 'redirect_uri', REMEMBER: 'remember_me', TOKEN: '_token', - VERSION: 'v3.5.1 GA' + VERSION: 'v3.5.2 GA' }; diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/access/contorller/RoleMemberController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/access/contorller/RoleMemberController.java index 3c85564f..7023c418 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/access/contorller/RoleMemberController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/access/contorller/RoleMemberController.java @@ -88,7 +88,7 @@ public class RoleMemberController { return new Message>( roleMemberService.queryPageResults("memberNotInRole",roleMember)).buildResponse(); } - + @RequestMapping(value = { "/rolesNoMember" }) @ResponseBody public ResponseEntity rolesNoMember(@ModelAttribute RoleMember roleMember,@CurrentUser UserInfo currentUser) { @@ -97,6 +97,12 @@ public class RoleMemberController { roleMemberService.rolesNoMember(roleMember)).buildResponse(); } + /** + * Members add to the Role + * @param roleMember + * @param currentUser + * @return + */ @RequestMapping(value = {"/add"}) @ResponseBody public ResponseEntity addRoleMember(@RequestBody RoleMember roleMember,@CurrentUser UserInfo currentUser) { @@ -120,7 +126,7 @@ public class RoleMemberController { roleMember.getRoleName(), arrMemberIds[i], arrMemberNames[i], - "USER", + roleMember.getType(), currentUser.getInstId()); newRoleMember.setId(WebContext.genId()); result = roleMemberService.insert(newRoleMember); @@ -133,9 +139,15 @@ public class RoleMemberController { } - @RequestMapping(value = {"/addMember2Groups"}) + /** + * Member add to Roles + * @param roleMember + * @param currentUser + * @return + */ + @RequestMapping(value = {"/addMember2Roles"}) @ResponseBody - public ResponseEntity addMember2Groups(@RequestBody RoleMember roleMember,@CurrentUser UserInfo currentUser) { + public ResponseEntity addMember2Roles(@RequestBody RoleMember roleMember,@CurrentUser UserInfo currentUser) { if (roleMember == null || StringUtils.isBlank(roleMember.getUsername())) { return new Message(Message.FAIL).buildResponse(); }