From 7193ba2316ea9da976133bc34e0681121a58d63b Mon Sep 17 00:00:00 2001
From: richjohnrambo <richjohnrambo@gmail.com>
Date: Thu, 3 Sep 2026 17:11:36 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AE=8C=E5=96=84=E5=90=8E=E5=8F=B0?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=86=85=E9=83=A8=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/tinode/config.template            | 10 +++++-----
 server/internal_admin_query_resources.go | 12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/docker/tinode/config.template b/docker/tinode/config.template
index 7bb4607..ff237c6 100644
--- a/docker/tinode/config.template
+++ b/docker/tinode/config.template
@@ -155,17 +155,17 @@
 		"time_window_seconds": 300,
 		"services": {
 			"hotgo-admin": {
-				"secret": "8569f5626a54950539eece9f731c9e3bf073daa74af8d23735d19afacac40f4b",
+				"secret": "$INTERNAL_API_HOTGO_SECRET",
 				"allow": ["admin_query"]
 			}
 		}
 	},
 	"admin_internal_api": {
 		"enabled": true,
-		"base_url": "http://im-admin:8000",
-		"service_name": "im-server",
-		"secret": "b96832c04dbfb6dd768930ec9f082ecd90d87a1ffdaa493aa070617c48de9097",
-		"timeout_ms": 3000
+		"base_url": "$ADMIN_INTERNAL_API_BASE_URL",
+		"service_name": "$ADMIN_INTERNAL_API_SERVICE_NAME",
+		"secret": "$ADMIN_INTERNAL_API_SECRET",
+		"timeout_ms": $ADMIN_INTERNAL_API_TIMEOUT_MS
 	},
 
 	"acc_validation": {
diff --git a/server/internal_admin_query_resources.go b/server/internal_admin_query_resources.go
index 51822c3..fd472c2 100644
--- a/server/internal_admin_query_resources.go
+++ b/server/internal_admin_query_resources.go
@@ -118,14 +118,14 @@ var internalOutboxResourceSpecs = map[string]*internalQuerySpec{
 
 var internalOrgResourceSpecs = map[string]*internalQuerySpec{
 	"departments": {
-		Select: "SELECT id,department_id,parent_id,name,sort_order,state,created_at,updated_at",
-		From:   "FROM im_org_departments", DefaultSort: "ORDER BY sort_order ASC,id ASC",
-		Filters: []internalQueryFilter{{"parent_id", "parent_id", "=", "string"}, {"state", "state", "=", "string"}},
+		Select: "SELECT d.id,d.department_id,d.parent_id,d.name,d.sort_order,d.version,d.state,d.created_at,d.updated_at,(SELECT COUNT(*) FROM im_org_departments child WHERE child.parent_id=d.department_id AND child.state='active') AS child_count,(SELECT COUNT(*) FROM im_org_members m WHERE m.department_id=d.department_id) AS member_count",
+		From:   "FROM im_org_departments d", DefaultSort: "ORDER BY d.sort_order ASC,d.id ASC",
+		Filters: []internalQueryFilter{{"department_id", "d.department_id", "=", "string"}, {"parent_id", "d.parent_id", "=", "string"}, {"name", "d.name", "LIKE", "string"}, {"state", "d.state", "=", "string"}},
 	},
 	"members": {
-		Select: "SELECT id,department_id,user_id,display_name,title,mobile,email,employment_state,sort_order,created_at,updated_at",
-		From:   "FROM im_org_members", DefaultSort: "ORDER BY sort_order ASC,id ASC",
-		Filters: []internalQueryFilter{{"department_id", "department_id", "=", "string"}, {"user_id", "user_id", "=", "uid"}, {"employment_state", "employment_state", "=", "string"}},
+		Select: "SELECT m.id,m.department_id,COALESCE(d.name,'') AS department_name,m.user_id,m.display_name,m.position,m.avatar_file_id,m.mobile,m.email,m.employment_state,m.contactable,m.sort_order,m.version,m.created_at,m.updated_at",
+		From:   "FROM im_org_members m LEFT JOIN im_org_departments d ON d.department_id=m.department_id", DefaultSort: "ORDER BY m.sort_order ASC,m.id ASC",
+		Filters: []internalQueryFilter{{"department_id", "m.department_id", "=", "string"}, {"user_id", "m.user_id", "=", "uid"}, {"q", "m.display_name", "LIKE", "string"}, {"employment_state", "m.employment_state", "=", "string"}},
 	},
 }