From cf9a4a04244cf8ff6088b373a9a7ca5b47086507 Mon Sep 17 00:00:00 2001
From: huchuanhu <huchuanhu@163.com>
Date: Sat, 20 Apr 2024 11:19:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jnpf/database/config/MybatisPlusMetaObjectHandler.java | 5 ++++-
 .../jnpf/permission/service/impl/AuthorizeServiceImpl.java | 7 ++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

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<AuthorizeMapper, Auth
                                 add(userInfo.getOrganizeId());
                             }});
                             if(CollectionUtils.isNotEmpty(orgAllPathList)){
-                                itemValue = String.join(",", orgAllPathList.get(0));
+                                itemValue = JSON.toJSONString(orgAllPathList.get(0));
+                                itemValue = itemValue.substring(1);
+                                itemValue = itemValue.substring(0, itemValue.length() -1);//去掉[]
                             }else{
                                 itemValue = "";
                             }
@@ -790,6 +794,7 @@ public class AuthorizeServiceImpl extends SuperServiceImpl<AuthorizeMapper, Auth
      * @param allIdList  组织id列表。
      * @return
      */
+    @NotNull
     private List<List<String>> getOrgAllPathList(List<String> allIdList) {
         List<List<String>> resOrg=new ArrayList<>();
         for(String itemOrg: allIdList){