diff --git a/jnpf-java-boot/jnpf-admin/src/main/java/jnpf/database/config/MybatisPlusMetaObjectHandler.java b/jnpf-java-boot/jnpf-admin/src/main/java/jnpf/database/config/MybatisPlusMetaObjectHandler.java index c2ea6909..0064eaa8 100644 --- a/jnpf-java-boot/jnpf-admin/src/main/java/jnpf/database/config/MybatisPlusMetaObjectHandler.java +++ b/jnpf-java-boot/jnpf-admin/src/main/java/jnpf/database/config/MybatisPlusMetaObjectHandler.java @@ -65,8 +65,11 @@ public class MybatisPlusMetaObjectHandler implements MetaObjectHandler { }else{ companyId = organizeEntity.getId(); } + organizeEntity = organizeService.getInfo(organizeEntity.getParentId()); + if(organizeEntity != null){ + organizeIdList.add(organizeEntity.getId()); + } } - organizeIdList.add("96240625-934F-490B-8AA6-0BC775B18468"); Collections.reverse(organizeIdList); String organizeId = JSON.toJSONString(organizeIdList); // 可以在这里填充编码查询到编码规则自动填充 diff --git a/jnpf-java-boot/jnpf-permission/jnpf-permission-biz/src/main/java/jnpf/permission/service/impl/AuthorizeServiceImpl.java b/jnpf-java-boot/jnpf-permission/jnpf-permission-biz/src/main/java/jnpf/permission/service/impl/AuthorizeServiceImpl.java index 85400aa1..82337589 100644 --- a/jnpf-java-boot/jnpf-permission/jnpf-permission-biz/src/main/java/jnpf/permission/service/impl/AuthorizeServiceImpl.java +++ b/jnpf-java-boot/jnpf-permission/jnpf-permission-biz/src/main/java/jnpf/permission/service/impl/AuthorizeServiceImpl.java @@ -2,6 +2,7 @@ package jnpf.permission.service.impl; import cn.hutool.core.text.StrPool; +import com.alibaba.fastjson.JSON; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.dynamic.datasource.annotation.DSTransactional; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -40,6 +41,7 @@ import jnpf.permission.service.*; import jnpf.util.*; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; +import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -716,7 +718,9 @@ public class AuthorizeServiceImpl extends SuperServiceImpl> getOrgAllPathList(List allIdList) { List> resOrg=new ArrayList<>(); for(String itemOrg: allIdList){