wangli/tyr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:(REQ-2298) 修改代码检测的阻塞问题

Browse Source
This commit is contained in:
lilong 2024-05-27 09:47:50 +08:00
parent e7f8805cdf
commit abc5e7e0fa
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tyr-server/src/main/java/cn/axzo/tyr/server/job/CMSOtherRoleJobHandler.java
View File

@ -74,10 +74,10 @@ public class CMSOtherRoleJobHandler extends IJobHandler {
log.info("CMSOtherRoleJobHandler start"); log.info("CMSOtherRoleJobHandler start");
// 查询无法回溯的角色 // 查询无法回溯的角色
List<SaasRole> oldRole = roleDao.lambdaQuery() List<SaasRole> oldRole = roleDao.lambdaQuery()
.ne(SaasRole::getWorkspaceId, -1l) .ne(SaasRole::getWorkspaceId, -1L)
.eq(SaasRole::getRoleType, "init") .eq(SaasRole::getRoleType, "init")
.in(SaasRole::getFitOuTypeBit, Arrays.asList(1, 2, 4, 8, 16)) .in(SaasRole::getFitOuTypeBit, Arrays.asList(1, 2, 4, 8, 16))
.eq(SaasRole::getFromPreRoleId, 0l) .eq(SaasRole::getFromPreRoleId, 0L)
.eq(BaseEntity::getIsDelete, 0) .eq(BaseEntity::getIsDelete, 0)
.list(); .list();
if (CollectionUtils.isEmpty(oldRole)) { if (CollectionUtils.isEmpty(oldRole)) {

12
tyr-server/src/main/java/cn/axzo/tyr/server/job/CMSRoleJobHandler.java
View File

@ -141,8 +141,8 @@ public class CMSRoleJobHandler extends IJobHandler {
roleGroup.setWorkspaceTypeCode(workspaceTypCode); roleGroup.setWorkspaceTypeCode(workspaceTypCode);
roleGroup.setOuTypeCode(ouType); roleGroup.setOuTypeCode(ouType);
roleGroup.setName(groupName); roleGroup.setName(groupName);
roleGroup.setWorkspaceId(-1l); roleGroup.setWorkspaceId(-1L);
roleGroup.setOuId(-1l); roleGroup.setOuId(-1L);
roleGroup.setSort(1); roleGroup.setSort(1);
roleGroupDao.save(roleGroup); roleGroupDao.save(roleGroup);
@ -151,10 +151,10 @@ public class CMSRoleJobHandler extends IJobHandler {
SaasRole newRole = new SaasRole(); SaasRole newRole = new SaasRole();
newRole.setRoleType(RoleTypeEnum.INIT.getValue()); newRole.setRoleType(RoleTypeEnum.INIT.getValue());
newRole.setName(preRole.getName()); newRole.setName(preRole.getName());
newRole.setCreateBy(-1l); newRole.setCreateBy(-1L);
newRole.setUpdateBy(-1l); newRole.setUpdateBy(-1L);
newRole.setOwnerOuId(-1l); newRole.setOwnerOuId(-1L);
newRole.setWorkspaceId(-1l); newRole.setWorkspaceId(-1L);
roleDao.save(newRole); roleDao.save(newRole);
// 创建角色分组关联关系 // 创建角色分组关联关系

8
tyr-server/src/main/java/cn/axzo/tyr/server/job/OMSRoleJobHandler.java
View File

@ -64,8 +64,8 @@ public class OMSRoleJobHandler extends IJobHandler {
roleGroup.setWorkspaceTypeCode("6"); roleGroup.setWorkspaceTypeCode("6");
roleGroup.setOuTypeCode("6"); roleGroup.setOuTypeCode("6");
roleGroup.setName("管理员"); roleGroup.setName("管理员");
roleGroup.setWorkspaceId(-1l); roleGroup.setWorkspaceId(-1L);
roleGroup.setOuId(-1l); roleGroup.setOuId(-1L);
roleGroup.setSort(1); roleGroup.setSort(1);
roleGroupDao.save(roleGroup); roleGroupDao.save(roleGroup);
// 查询OMS的角色 workspaceType=6 OMS的角色 // 查询OMS的角色 workspaceType=6 OMS的角色
@ -75,8 +75,8 @@ public class OMSRoleJobHandler extends IJobHandler {
.list(); .list();
// 重置老角色多余的字段 // 重置老角色多余的字段
oldRole.forEach(e -> { oldRole.forEach(e -> {
e.setWorkspaceId(-1l); e.setWorkspaceId(-1L);
e.setOwnerOuId(-1l); e.setOwnerOuId(-1L);
}); });
roleDao.updateBatchById(oldRole); roleDao.updateBatchById(oldRole);
// 保存角色分组关联关系 // 保存角色分组关联关系

2
tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasRoleGroupDao.java
View File

@ -50,7 +50,7 @@ public class SaasRoleGroupDao extends ServiceImpl<SaasRoleGroupMapper, SaasRoleG
public void delete(List<Long> id) { public void delete(List<Long> id) {
lambdaUpdate() lambdaUpdate()
.in(BaseEntity::getId,id) .in(BaseEntity::getId,id)
.set(BaseEntity::getIsDelete,1l) .set(BaseEntity::getIsDelete, 1L)
.update(); .update();
} }

2
tyr-server/src/test/java/cn/axzo/tyr/server/permission/RoleUserTest.java
View File

@ -55,7 +55,7 @@ public class RoleUserTest {
.ouId(123L) .ouId(123L)
.identityId(32L) .identityId(32L)
.identityType(IdentityType.PRACTITIONER) .identityType(IdentityType.PRACTITIONER)
.build(), Arrays.asList(4l)); .build(), Arrays.asList(4L));
} }
@Test @Test