From acfd2aa2697280f8421bc9256a437f294ce5f922 Mon Sep 17 00:00:00 2001 From: MaxKey Date: Sat, 7 Oct 2023 22:48:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8A=A8=E6=80=81=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=BB=84=E5=87=BA=E7=8E=B0bug=20#I85U4I?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../persistence/service/GroupsService.java | 14 ++-- .../mapper/xml/mysql/GroupMemberMapper.xml | 4 +- .../src/app/entity/Groups.ts | 4 +- .../group-editer/group-editer.component.html | 22 +++--- .../routes/idm/groups/groups.component.html | 79 ++++++++++++------- .../select-groups.component.html | 58 +++++++++----- 6 files changed, 111 insertions(+), 70 deletions(-) diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/GroupsService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/GroupsService.java index 4ce3a0b6d..0da2a718c 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/GroupsService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/GroupsService.java @@ -47,7 +47,7 @@ public class GroupsService extends JpaService implements Serializable { final static Logger _logger = LoggerFactory.getLogger(GroupsService.class); @JsonIgnore @Autowired - GroupMemberService service; + GroupMemberService groupMemberService; @Autowired InstitutionsService institutionsService; @@ -71,7 +71,7 @@ public class GroupsService extends JpaService implements Serializable { public boolean deleteById(String groupId) { this.remove(groupId); - service.deleteByGroupId(groupId); + groupMemberService.deleteByGroupId(groupId); return true; } @@ -131,14 +131,14 @@ public class GroupsService extends JpaService implements Serializable { if(isDynamicTimeSupport) { if(isBetweenEffectiveTime) { - service.deleteDynamicMember(dynamicGroup); - service.addDynamicMember(dynamicGroup); + groupMemberService.deleteDynamicMember(dynamicGroup); + groupMemberService.addDynamicMember(dynamicGroup); }else { - service.deleteDynamicMember(dynamicGroup); + groupMemberService.deleteDynamicMember(dynamicGroup); } }else{ - service.deleteDynamicMember(dynamicGroup); - service.addDynamicMember(dynamicGroup); + groupMemberService.deleteDynamicMember(dynamicGroup); + groupMemberService.addDynamicMember(dynamicGroup); } } } diff --git a/maxkey-persistence/src/main/resources/org/dromara/maxkey/persistence/mapper/xml/mysql/GroupMemberMapper.xml b/maxkey-persistence/src/main/resources/org/dromara/maxkey/persistence/mapper/xml/mysql/GroupMemberMapper.xml index 638a09be1..b4f2123d7 100644 --- a/maxkey-persistence/src/main/resources/org/dromara/maxkey/persistence/mapper/xml/mysql/GroupMemberMapper.xml +++ b/maxkey-persistence/src/main/resources/org/dromara/maxkey/persistence/mapper/xml/mysql/GroupMemberMapper.xml @@ -184,7 +184,7 @@ - + insert into mxk_group_member( id, groupid, @@ -213,7 +213,7 @@ - + delete from mxk_group_member gm where type = 'user-dynamic' and gm.groupid=#{id} diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/Groups.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/Groups.ts index 19241cf8d..8aa7330c6 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/Groups.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/Groups.ts @@ -19,8 +19,8 @@ import format from 'date-fns/format'; import { BaseEntity } from './BaseEntity'; export class Groups extends BaseEntity { - roleCode!: String; - roleName!: String; + groupCode!: String; + groupName!: String; category!: String; filters!: String; orgIdsList!: String; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/groups/group-editer/group-editer.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/groups/group-editer/group-editer.component.html index 215b3d3be..2f3001c13 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/groups/group-editer/group-editer.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/groups/group-editer/group-editer.component.html @@ -8,28 +8,28 @@ - {{ 'mxk.text.id' | i18n }} + {{ 'mxk.text.id' | i18n }} - + - {{ 'mxk.roles.name' | i18n }} + {{ 'mxk.groups.name' | i18n }} - + - {{ 'mxk.roles.category' | i18n }} + {{ 'mxk.groups.category' | i18n }} - - + + - {{ 'mxk.roles.resumeTime' | i18n }} + {{ 'mxk.groups.resumeTime' | i18n }} - {{ 'mxk.roles.suspendTime' | i18n }} + {{ 'mxk.groups.suspendTime' | i18n }} - {{ 'mxk.roles.orgIdsList' | i18n }} + {{ 'mxk.groups.orgIdsList' | i18n }} - {{ 'mxk.roles.filters' | i18n }} + {{ 'mxk.groups.filters' | i18n }}