fix: 修复组织机构可能发生BUG的问题点

3 years ago · 459370bd7a
parent e65f8f70d3
commit 459370bd7a
2 changed files with 4 additions and 1 deletions
--- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/org/service/impl/SysOrgServiceImpl.java
+++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/org/service/impl/SysOrgServiceImpl.java
@ -93,7 +93,7 @@ public class SysOrgServiceImpl extends CrudServiceImpl<SysOrgMapper, SysOrg, Sys
        }

        // 如果上级ID 为空 则默认为 0
-        if(StringUtils.isEmpty(model.getParentId())){
+        if(StringUtils.isEmpty(model.getParentId()) || TOP_PARENT_ID.equals(model.getParentId())){
            model.setParentId(TOP_PARENT_ID);
            model.setParentIds(TOP_PARENT_ID);
        }
--- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/service/impl/UserOrgRefServiceImpl.java
+++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/service/impl/UserOrgRefServiceImpl.java
@ -126,6 +126,9 @@ public class UserOrgRefServiceImpl extends ServiceImpl<UserOrgRefMapper, SysUser
                queryWrapper.eq(
                        FieldUtil.humpToUnderline(MyBatisConstants.FIELD_PARENT_ID), PARENT_ID
                );
+                queryWrapper.eq(
+                        FieldUtil.humpToUnderline(MyBatisConstants.FIELD_TENANT), userModel.getTenantId()
+                );

                // 注意 之前这儿会有死循环数据权限查询问题
                List<SysOrg> orgList = iSysOrgService.list(queryWrapper);