LiRuochen_WorkFlow/MaxKey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复动态用户组出现bug #I85U4I

Browse Source
This commit is contained in:
MaxKey
2023-10-07 22:48:51 +08:00
parent 0bd18fb25c
commit acfd2aa269
6 changed files with 111 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/GroupsService.java
+7 -7
View File
@@ -47,7 +47,7 @@ public class GroupsService extends JpaService<Groups> 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<Groups> 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<Groups> 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);
}
}
}
maxkey-persistence/src/main/resources/org/dromara/maxkey/persistence/mapper/xml/mysql/GroupMemberMapper.xml
+2 -2
View File
@@ -184,7 +184,7 @@
</if>
</select>
<update id="addDynamicGroupMember" parameterType="Groups" >
<update id="addDynamicMember" parameterType="Groups" >
insert into mxk_group_member(
id,
groupid,
@@ -213,7 +213,7 @@
</if>
</update>
<delete id="deleteDynamicGroupMember" parameterType="Groups" >
<delete id="deleteDynamicMember" parameterType="Groups" >
delete from mxk_group_member gm
where type = 'user-dynamic'
and gm.groupid=#{id}