From 5768ca646e8722744f3d18a3b2059472da89b719 Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Thu, 5 Feb 2026 12:31:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug:=E6=AF=94=E5=A6=82?=
 =?UTF-8?q?=E5=8F=AA=E7=BB=99=E7=A7=9F=E6=88=B7=E8=A7=92=E8=89=B2=E7=9A=84?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E9=87=8C=E9=9D=A2=E7=9A=84=E5=9F=BA=E7=A1=80?=
 =?UTF-8?q?=E8=B5=84=E6=96=99=E8=B5=8B=E4=BA=88=E4=BE=9B=E5=BA=94=E5=95=86?=
 =?UTF-8?q?=E7=9A=84=E8=8F=9C=E5=8D=95=EF=BC=8C=E7=84=B6=E5=90=8E=E7=94=A8?=
 =?UTF-8?q?=E7=A7=9F=E6=88=B7=E5=8E=BB=E7=99=BB=E5=BD=95=EF=BC=8C=E5=86=8D?=
 =?UTF-8?q?=E5=8E=BB=E7=BB=99=E4=B8=8B=E7=BA=A7=E7=94=A8=E6=88=B7=E8=B5=8B?=
 =?UTF-8?q?=E4=BA=88=E8=8F=9C=E5=8D=95=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C?=
 =?UTF-8?q?=E5=8F=91=E7=8E=B0=E6=B2=A1=E6=9C=89=E5=9F=BA=E7=A1=80=E8=B5=84?=
 =?UTF-8?q?=E6=96=99=E8=BF=99=E4=B8=AA=E5=A4=A7=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jsh/erp/controller/FunctionController.java    | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/FunctionController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/FunctionController.java
index f1b1378d..9615d496 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/controller/FunctionController.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/FunctionController.java
@@ -241,7 +241,7 @@ public class FunctionController extends BaseController {
             if("admin".equals(userInfo.getLoginName())) {
                 funIdList = null;
             }
-            List<Function> dataListFun = functionService.findRoleFunction("0", funIdList);
+            List<Function> dataListFun = functionService.findRoleFunction("0", null);
             //开始拼接json数据
             JSONObject outer = new JSONObject();
             outer.put("id", 0);
@@ -255,15 +255,20 @@ public class FunctionController extends BaseController {
                 //根据条件从列表里面移除"系统管理"
                 List<Function> dataList = new ArrayList<>();
                 for (Function fun : dataListFun) {
+                    List<Function> childrenList = functionService.getRoleFunction(fun.getNumber());
                     String token = request.getHeader("X-Access-Token");
                     Long tenantId = Tools.getTenantIdByToken(token);
                     if (tenantId!=0L) {
                         if(!("系统管理").equals(fun.getName())) {
-                            dataList.add(fun);
+                            if(!childrenList.isEmpty()) {
+                                dataList.add(fun);
+                            }
                         }
                     } else {
                         //超管
-                        dataList.add(fun);
+                        if(!childrenList.isEmpty()) {
+                            dataList.add(fun);
+                        }
                     }
                 }
                 dataArray = getFunctionList(dataList, type, keyId, funIdList);