From 22207057df5ad0a3e828240e8effb0f3bed21ad3 Mon Sep 17 00:00:00 2001
From: efren <79289982@qq.com>
Date: Fri, 18 Jul 2025 09:15:09 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9C=BA=E6=9E=84=E5=BC=82?=
 =?UTF-8?q?=E6=AD=A5=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E8=A1=A5=E5=85=85?=
 =?UTF-8?q?=E6=A0=B9=E8=8A=82=E7=82=B9=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/chinaunicom/mall/ebtp/login/common/Constants.java  | 5 +++++
 .../zyhy/ebtp/supplier/base/controller/OrgController.java  | 7 +++++++
 2 files changed, 12 insertions(+)

diff --git a/src/main/java/com/chinaunicom/mall/ebtp/login/common/Constants.java b/src/main/java/com/chinaunicom/mall/ebtp/login/common/Constants.java
index 4d40001..66914fa 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/login/common/Constants.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/login/common/Constants.java
@@ -15,6 +15,11 @@ public class Constants {
     public static final String ANNO_MODE_VO_B = "BizAnnoVoBtable";
     public static final String ANNO_MODE_VO_M = "BizAnnoVoMtable";
 
+    /**
+     * 组织结构书根节点
+     */
+    public static final String ROOT_NODE = "10000000";
+
     public static final String EBTP_TENANT_BY = "EBTP";
 
     public static final String DELETE_FLAG_NORMAL = "normal";
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/OrgController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/OrgController.java
index 646eb1a..051e425 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/OrgController.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/OrgController.java
@@ -1,10 +1,13 @@
 package com.chinaunicom.zyhy.ebtp.supplier.base.controller;
 
 import com.chinaunicom.mall.ebtp.common.base.entity.*;
+import com.chinaunicom.mall.ebtp.login.common.Constants;
 import com.chinaunicom.zyhy.ebtp.supplier.base.service.IOrgService;
 import com.chinaunicom.zyhy.ebtp.supplier.base.service.IUserService;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.util.EntityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
@@ -34,6 +37,10 @@ public class OrgController {
     @ApiOperation("查询机构列表")
     @GetMapping("/list")
     public BaseResponse<List<SysOrg>> getOrglist(@ApiParam(value = "查询对象数据", required = false) @SpringQueryMap SysOrg param){
+        // 如果上级机构ID和机构ID都为空，则以根节点为起点查下级
+        if(StringUtils.isEmpty(param.getOrgId()) && StringUtils.isEmpty(param.getUpOrgId())) {
+            param.setUpOrgId(Constants.ROOT_NODE);
+        }
         return orgService.getOrglist(param);
     }