From ab84f6b87d8fa867e243bc74f1672a930c1c7f6a Mon Sep 17 00:00:00 2001
From: 111 <a111@111deMacBook-Pro.local>
Date: Sat, 24 Jan 2026 10:20:02 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=81=E5=BE=AE=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E7=A7=9F=E6=88=B7=E4=B8=8B=E6=8B=89=E9=80=89=E6=8B=A9=20+=20co?=
 =?UTF-8?q?rp=5Fid=20=E8=87=AA=E5=8A=A8=E5=A1=AB=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 租户表增加 corp_id 字段（企业微信企业ID）
- 租户管理页面支持配置 corp_id
- 企微应用页面租户从下拉选择
- 选择租户后自动填入 corp_id 并禁用编辑
- 提示用户如租户未配置 corp_id 需先去配置
---
 backend/app/models/tenant.py                  |  1 +
 backend/app/routers/tenants.py                |  5 ++
 .../src/views/tenant-wechat-apps/index.vue    | 69 +++++++++++++++++--
 frontend/src/views/tenants/index.vue          |  7 ++
 4 files changed, 75 insertions(+), 7 deletions(-)

diff --git a/backend/app/models/tenant.py b/backend/app/models/tenant.py
index 1b2c03c..1a84620 100644
--- a/backend/app/models/tenant.py
+++ b/backend/app/models/tenant.py
@@ -11,6 +11,7 @@ class Tenant(Base):
     id = Column(BigInteger, primary_key=True, autoincrement=True)
     code = Column(String(50), unique=True, nullable=False)
     name = Column(String(100), nullable=False)
+    corp_id = Column(String(100))  # 企业微信企业ID
     contact_info = Column(JSON)
     status = Column(Enum('active', 'expired', 'trial'), default='active')
     expired_at = Column(Date)
diff --git a/backend/app/routers/tenants.py b/backend/app/routers/tenants.py
index 67c2cbc..48dcffc 100644
--- a/backend/app/routers/tenants.py
+++ b/backend/app/routers/tenants.py
@@ -20,6 +20,7 @@ router = APIRouter(prefix="/tenants", tags=["租户管理"])
 class TenantCreate(BaseModel):
     code: str
     name: str
+    corp_id: Optional[str] = None  # 企业微信企业ID
     contact_info: Optional[dict] = None
     status: str = "active"
     expired_at: Optional[date] = None
@@ -27,6 +28,7 @@ class TenantCreate(BaseModel):
 
 class TenantUpdate(BaseModel):
     name: Optional[str] = None
+    corp_id: Optional[str] = None  # 企业微信企业ID
     contact_info: Optional[dict] = None
     status: Optional[str] = None
     expired_at: Optional[date] = None
@@ -81,6 +83,7 @@ async def list_tenants(
                 "id": t.id,
                 "code": t.code,
                 "name": t.name,
+                "corp_id": t.corp_id,
                 "contact_info": t.contact_info,
                 "status": t.status,
                 "expired_at": t.expired_at,
@@ -120,6 +123,7 @@ async def get_tenant(
         "id": tenant.id,
         "code": tenant.code,
         "name": tenant.name,
+        "corp_id": tenant.corp_id,
         "contact_info": tenant.contact_info,
         "status": tenant.status,
         "expired_at": tenant.expired_at,
@@ -159,6 +163,7 @@ async def create_tenant(
     tenant = Tenant(
         code=data.code,
         name=data.name,
+        corp_id=data.corp_id,
         contact_info=data.contact_info,
         status=data.status,
         expired_at=data.expired_at
diff --git a/frontend/src/views/tenant-wechat-apps/index.vue b/frontend/src/views/tenant-wechat-apps/index.vue
index a22fb36..27d36f7 100644
--- a/frontend/src/views/tenant-wechat-apps/index.vue
+++ b/frontend/src/views/tenant-wechat-apps/index.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, reactive, onMounted } from 'vue'
+import { ref, reactive, onMounted, watch, computed } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import api from '@/api'
 import { useAuthStore } from '@/stores/auth'
@@ -15,6 +15,9 @@ const query = reactive({
   tenant_id: ''
 })
 
+// 租户列表（用于下拉选择）
+const tenantList = ref([])
+
 // 对话框
 const dialogVisible = ref(false)
 const dialogTitle = ref('')
@@ -28,13 +31,37 @@ const form = reactive({
   secret: ''
 })
 
+// 根据选中的租户获取 corp_id
+const selectedTenant = computed(() => {
+  return tenantList.value.find(t => t.code === form.tenant_id)
+})
+
+// 监听租户选择变化，自动填入 corp_id
+watch(() => form.tenant_id, (newVal) => {
+  if (newVal && !editingId.value) {
+    const tenant = tenantList.value.find(t => t.code === newVal)
+    if (tenant) {
+      form.corp_id = tenant.corp_id || ''
+    }
+  }
+})
+
 const rules = {
-  tenant_id: [{ required: true, message: '请输入租户ID', trigger: 'blur' }],
+  tenant_id: [{ required: true, message: '请选择租户', trigger: 'change' }],
   name: [{ required: true, message: '请输入应用名称', trigger: 'blur' }],
-  corp_id: [{ required: true, message: '请输入企业ID', trigger: 'blur' }],
   agent_id: [{ required: true, message: '请输入应用ID', trigger: 'blur' }]
 }
 
+// 获取租户列表
+async function fetchTenants() {
+  try {
+    const res = await api.get('/api/tenants', { params: { size: 1000 } })
+    tenantList.value = res.data.items || []
+  } catch (e) {
+    console.error(e)
+  }
+}
+
 async function fetchList() {
   loading.value = true
   try {
@@ -68,6 +95,13 @@ function handleCreate() {
     agent_id: '',
     secret: ''
   })
+  // 如果已选择租户，自动填入 corp_id
+  if (form.tenant_id) {
+    const tenant = tenantList.value.find(t => t.code === form.tenant_id)
+    if (tenant) {
+      form.corp_id = tenant.corp_id || ''
+    }
+  }
   dialogVisible.value = true
 }
 
@@ -138,6 +172,7 @@ async function handleViewSecret(row) {
 }
 
 onMounted(() => {
+  fetchTenants()
   fetchList()
 })
 </script>
@@ -208,14 +243,34 @@ onMounted(() => {
     <!-- 编辑对话框 -->
     <el-dialog v-model="dialogVisible" :title="dialogTitle" width="500px">
       <el-form ref="formRef" :model="form" :rules="rules" label-width="100px">
-        <el-form-item label="租户ID" prop="tenant_id">
-          <el-input v-model="form.tenant_id" :disabled="!!editingId" placeholder="如: qiqi" />
+        <el-form-item label="租户" prop="tenant_id">
+          <el-select 
+            v-model="form.tenant_id" 
+            :disabled="!!editingId" 
+            placeholder="请选择租户"
+            filterable
+            style="width: 100%"
+          >
+            <el-option
+              v-for="tenant in tenantList"
+              :key="tenant.code"
+              :label="`${tenant.name} (${tenant.code})`"
+              :value="tenant.code"
+            />
+          </el-select>
         </el-form-item>
         <el-form-item label="应用名称" prop="name">
           <el-input v-model="form.name" placeholder="如: 工具集企微应用" />
         </el-form-item>
-        <el-form-item label="企业ID" prop="corp_id">
-          <el-input v-model="form.corp_id" placeholder="ww开头的企业ID" />
+        <el-form-item label="企业ID">
+          <el-input 
+            v-model="form.corp_id" 
+            disabled 
+            :placeholder="selectedTenant?.corp_id ? '' : '请先在租户管理中配置企业ID'" 
+          />
+          <div v-if="form.tenant_id && !selectedTenant?.corp_id" class="el-form-item__error" style="position: static;">
+            该租户未配置企业ID，请先到租户管理中配置
+          </div>
         </el-form-item>
         <el-form-item label="应用ID" prop="agent_id">
           <el-input v-model="form.agent_id" placeholder="自建应用的 AgentId" />
diff --git a/frontend/src/views/tenants/index.vue b/frontend/src/views/tenants/index.vue
index eb7cb4e..5f08635 100644
--- a/frontend/src/views/tenants/index.vue
+++ b/frontend/src/views/tenants/index.vue
@@ -26,6 +26,7 @@ const formRef = ref(null)
 const form = reactive({
   code: '',
   name: '',
+  corp_id: '',
   status: 'active',
   expired_at: null,
   contact_info: {
@@ -69,6 +70,7 @@ function handleCreate() {
   Object.assign(form, {
     code: '',
     name: '',
+    corp_id: '',
     status: 'active',
     expired_at: null,
     contact_info: { contact: '', phone: '', email: '' }
@@ -82,6 +84,7 @@ function handleEdit(row) {
   Object.assign(form, {
     code: row.code,
     name: row.name,
+    corp_id: row.corp_id || '',
     status: row.status,
     expired_at: row.expired_at,
     contact_info: row.contact_info || { contact: '', phone: '', email: '' }
@@ -172,6 +175,7 @@ onMounted(() => {
       <el-table-column prop="id" label="ID" width="80" />
       <el-table-column prop="code" label="代码" width="120" />
       <el-table-column prop="name" label="名称" min-width="150" />
+      <el-table-column prop="corp_id" label="企业ID" width="200" show-overflow-tooltip />
       <el-table-column prop="status" label="状态" width="100">
         <template #default="{ row }">
           <el-tag :type="getStatusType(row.status)" size="small">
@@ -210,6 +214,9 @@ onMounted(() => {
         <el-form-item label="租户名称" prop="name">
           <el-input v-model="form.name" placeholder="公司/组织名称" />
         </el-form-item>
+        <el-form-item label="企业ID">
+          <el-input v-model="form.corp_id" placeholder="企业微信企业ID，ww开头" />
+        </el-form-item>
         <el-form-item label="状态">
           <el-select v-model="form.status" style="width: 100%">
             <el-option label="活跃" value="active" />