From 9c67793fc325ae537d3b22c5a3e72cbc2f9f0a6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=BF=97=E5=BC=BA?= <357099073@qq.com>
Date: Wed, 5 Nov 2025 17:50:02 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9F=A5=E8=AF=86=E5=BA=93=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E7=A7=9F=E6=88=B7=E9=9A=94=E7=A6=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc/src/api/menu.js                            |  8 ++
 pc/src/components/CommonAside.vue             | 18 +++-
 pc/src/components/CommonHeader.vue            | 17 +++-
 pc/src/router/index.js                        | 19 +++-
 .../apps/knowledge/components/detail.vue      |  5 -
 pc/src/views/apps/knowledge/index.vue         |  2 -
 pc/src/views/apps/oa/employees/index.vue      | 86 +++++++++++++++--
 pc/src/views/login/index.vue                  | 17 +++-
 pc/src/views/system/users/index.vue           |  2 +
 server/controllers/auth.go                    |  6 +-
 server/controllers/employee.go                | 92 ++++++++++--------
 server/controllers/knowledge.go               | 94 +++++++++++++++++--
 server/controllers/menu.go                    | 32 +++++++
 server/controllers/user.go                    |  2 +
 server/middleware/jwt.go                      |  8 ++
 server/models/employee.go                     | 18 +++-
 server/models/knowledge.go                    | 65 ++++++++++---
 server/models/menu.go                         | 68 ++++++++++++++
 server/routers/router.go                      |  1 +
 19 files changed, 473 insertions(+), 87 deletions(-)

diff --git a/pc/src/api/menu.js b/pc/src/api/menu.js
index 8919d3b..842e6da 100644
--- a/pc/src/api/menu.js
+++ b/pc/src/api/menu.js
@@ -8,6 +8,14 @@ export function getAllMenus() {
   });
 }
 
+// 获取租户菜单（根据角色权限）
+export function getTenantMenus(roleId) {
+  return request({
+    url: `/api/menus/tenant/${roleId}`,
+    method: "get",
+  });
+}
+
 // 更新菜单状态
 export function updateMenuStatus(menuId, status) {
   return request({
diff --git a/pc/src/components/CommonAside.vue b/pc/src/components/CommonAside.vue
index 5012535..6442b30 100644
--- a/pc/src/components/CommonAside.vue
+++ b/pc/src/components/CommonAside.vue
@@ -34,7 +34,7 @@
 import { ref, computed, onMounted, onUnmounted } from 'vue';
 import { useRouter, useRoute } from 'vue-router';
 import { useAllDataStore } from '@/stores';
-import { getAllMenus } from '@/api/menu';
+import { getAllMenus, getTenantMenus } from '@/api/menu';
 import MenuTreeItem from './MenuTreeItem.vue';
 
 const emit = defineEmits(['menu-click']);
@@ -196,8 +196,20 @@ const transformMenuData = (menus) => {
 const fetchMenus = async () => {
   loading.value = true; 
   try {
-    // 直接从接口获取菜单数据，不使用缓存
-    const res = await getAllMenus();
+    // 获取用户信息，判断登录类型
+    const userInfo = JSON.parse(localStorage.getItem('userInfo') || '{}');
+    const loginType = userInfo.type; // "user" 或 "employee"
+    const roleId = userInfo.role; // 角色ID
+    
+    let res;
+    if (loginType === "employee" && roleId) {
+      // 员工登录，使用getTenantMenus接口
+      res = await getTenantMenus(roleId);
+    } else {
+      // 用户登录，使用getAllMenus接口
+      res = await getAllMenus();
+    }
+    
     if (res && res.success && res.data) {
       const menuData = res.data;
       // 转换并排序菜单数据
diff --git a/pc/src/components/CommonHeader.vue b/pc/src/components/CommonHeader.vue
index b1c6695..256c442 100644
--- a/pc/src/components/CommonHeader.vue
+++ b/pc/src/components/CommonHeader.vue
@@ -62,7 +62,7 @@ import { useRouter, useRoute } from "vue-router";
 import { useAllDataStore } from "@/stores";
 import { useAuthStore } from "@/stores/auth";
 import { User, SwitchButton, Sunny, Moon, Refresh } from '@element-plus/icons-vue';
-import { getAllMenus } from '@/api/menu';
+import { getAllMenus, getTenantMenus } from '@/api/menu';
 import { ElMessage } from 'element-plus'; 
 
 const router = useRouter();
@@ -111,7 +111,20 @@ function saveMenuToCache(menus: Menu[]) {
 // 从API加载菜单
 async function loadMenuFromAPI(updateCache = true) {
   try {
-    const res = await getAllMenus(); 
+    // 获取用户信息，判断登录类型
+    const userInfo = JSON.parse(localStorage.getItem('userInfo') || '{}');
+    const loginType = userInfo.type; // "user" 或 "employee"
+    const roleId = userInfo.role; // 角色ID
+    
+    let res;
+    if (loginType === "employee" && roleId) {
+      // 员工登录，使用getTenantMenus接口
+      res = await getTenantMenus(roleId);
+    } else {
+      // 用户登录，使用getAllMenus接口
+      res = await getAllMenus();
+    }
+    
     const menus = res.data || [];
     if (updateCache && menus.length > 0) {
       saveMenuToCache(menus);
diff --git a/pc/src/router/index.js b/pc/src/router/index.js
index b5c1ed9..46b32ea 100644
--- a/pc/src/router/index.js
+++ b/pc/src/router/index.js
@@ -71,9 +71,22 @@ export async function loadAndAddDynamicRoutes() {
   // 创建加载 Promise
   routesLoadingPromise = (async () => {
     try {
-      // 直接从 API 获取菜单数据
-      const { getAllMenus } = await import("@/api/menu");
-      const res = await getAllMenus();
+      // 获取用户信息，判断登录类型
+      const userInfo = JSON.parse(localStorage.getItem('userInfo') || '{}');
+      const loginType = userInfo.type; // "user" 或 "employee"
+      const roleId = userInfo.role; // 角色ID
+      
+      // 根据登录类型选择不同的菜单接口
+      const { getAllMenus, getTenantMenus } = await import("@/api/menu");
+      let res;
+      
+      if (loginType === "employee" && roleId) {
+        // 员工登录，使用getTenantMenus接口
+        res = await getTenantMenus(roleId);
+      } else {
+        // 用户登录，使用getAllMenus接口
+        res = await getAllMenus();
+      }
       
       if (res && res.success && res.data) {
         // 添加动态路由
diff --git a/pc/src/views/apps/knowledge/components/detail.vue b/pc/src/views/apps/knowledge/components/detail.vue
index 5565891..5f1e8b7 100644
--- a/pc/src/views/apps/knowledge/components/detail.vue
+++ b/pc/src/views/apps/knowledge/components/detail.vue
@@ -27,10 +27,6 @@
           <h3 class="info-title">基本信息</h3>
           <el-divider />
           <div class="info-content">
-            <div class="info-item">
-              <span class="info-label">标题：</span>
-              <span class="info-value">{{ formData.title }}</span>
-            </div>
             <div class="info-item">
               <span class="info-label">分类：</span>
               <el-tag size="small" type="info">{{ formData.category }}</el-tag>
@@ -190,7 +186,6 @@ function handleDelete() {
 
 <style scoped lang="less">
 .knowledge-detail {
-  padding: 24px;
   min-height: 100%;
   background-color: var(--el-bg-color-page);
 }
diff --git a/pc/src/views/apps/knowledge/index.vue b/pc/src/views/apps/knowledge/index.vue
index 6d8ce68..224e230 100644
--- a/pc/src/views/apps/knowledge/index.vue
+++ b/pc/src/views/apps/knowledge/index.vue
@@ -519,7 +519,6 @@ onMounted(() => {
 
 <style lang="less" scoped>
 .knowledge-home {
-  padding: 24px;
   min-height: 100%;
   background-color: var(--el-bg-color-page);
 }
@@ -806,7 +805,6 @@ onMounted(() => {
 // 响应式
 @media (max-width: 768px) {
   .knowledge-home {
-    padding: 16px;
   }
 
   .search-section {
diff --git a/pc/src/views/apps/oa/employees/index.vue b/pc/src/views/apps/oa/employees/index.vue
index 791a8c0..b4cd90d 100644
--- a/pc/src/views/apps/oa/employees/index.vue
+++ b/pc/src/views/apps/oa/employees/index.vue
@@ -41,6 +41,11 @@
         align="center"
         min-width="200"
       />
+      <el-table-column prop="role" label="角色" width="150" align="center">
+        <template #default="scope">
+          <span>{{ scope.row.roleName || '未分配' }}</span>
+        </template>
+      </el-table-column>
       <el-table-column prop="department" label="部门" width="150" align="center">
         <template #default="scope">
           <span>{{ scope.row.departmentName || '未分配' }}</span>
@@ -160,6 +165,27 @@
             />
           </el-select>
         </el-form-item>
+        <el-form-item label="角色">
+          <el-select 
+            v-model="form.role" 
+            placeholder="请选择角色"
+            style="width: 100%"
+            :loading="loadingRoles"
+            clearable
+          >
+            <el-option
+              v-for="role in roleList"
+              :key="role.roleId"
+              :label="role.roleName"
+              :value="role.roleId"
+            >
+              <span>{{ role.roleName }}</span>
+              <span style="color: #8492a6; font-size: 13px; margin-left: 8px;">
+                ({{ role.roleCode }})
+              </span>
+            </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="开户行">
           <el-input v-model="form.bank_name" placeholder="请输入工资卡开户行" />
         </el-form-item>
@@ -231,6 +257,7 @@ import {
 } from "@/api/employee";
 import { getTenantDepartments, getDepartmentInfo } from "@/api/department";
 import { getTenantPositions, getPositionsByDepartment, getPositionInfo } from "@/api/position";
+import { getRoleByTenantId } from "@/api/role";
 import { useAuthStore } from "@/stores/auth";
 
 interface Employee {
@@ -241,6 +268,8 @@ interface Employee {
   email: string;
   department: string;
   position: string;
+  role: number;
+  roleName?: string;
   status: number;
   createTime: string;
   tenant_id: number;
@@ -258,6 +287,8 @@ const departmentTree = ref<any[]>([]);
 const loadingDepartments = ref(false);
 const positionList = ref<any[]>([]);
 const loadingPositions = ref(false);
+const roleList = ref<any[]>([]);
+const loadingRoles = ref(false);
 const loading = ref(false);
 
 // 获取当前登录用户的租户ID
@@ -271,7 +302,7 @@ const getCurrentTenantId = () => {
       const user = JSON.parse(userInfo);
       return user.tenant_id || user.tenantId || 0;
     } catch (e) {
-      console.error('Failed to parse user info:', e);
+      console.error('解析用户信息失败:', e);
     }
   }
   return 0;
@@ -311,6 +342,14 @@ const fetchEmployees = async () => {
         positionName = posInfo ? posInfo.name : '';
       }
       
+      // 查找角色名称
+      let roleName = '';
+      const roleId = item.role || null;
+      if (roleId) {
+        const roleInfo = roleList.value.find(r => r.roleId === roleId);
+        roleName = roleInfo ? roleInfo.roleName : '';
+      }
+      
       // 处理入职时间
       const createTime = item.create_time || item.createTime || null;
       
@@ -324,6 +363,8 @@ const fetchEmployees = async () => {
         departmentName: departmentName,
         position_id: positionId,
         positionName: positionName,
+        role: roleId,
+        roleName: roleName,
         bankName: item.bank_name || item.bankName || '',
         bankAccount: item.bank_account || item.bankAccount || '',
         status: item.status || 1,
@@ -515,10 +556,36 @@ const handleDepartmentChange = (departmentId: number | null) => {
   }
 };
 
+// 获取角色列表
+const fetchRoles = async () => {
+  loadingRoles.value = true;
+  try {
+    const tenantId = getCurrentTenantId();
+    const res = await getRoleByTenantId(tenantId);
+    
+    // 兼容接口返回的数据结构
+    if (res?.data && Array.isArray(res.data)) {
+      roleList.value = res.data;
+    } else if (res?.data?.data && Array.isArray(res.data.data)) {
+      roleList.value = res.data.data;
+    } else if (Array.isArray(res)) {
+      roleList.value = res;
+    } else {
+      roleList.value = [];
+    }
+  } catch (error: any) {
+    console.error('获取角色列表失败:', error);
+    roleList.value = [];
+  } finally {
+    loadingRoles.value = false;
+  }
+};
+
 onMounted(async () => {
   await Promise.all([
     fetchDepartments(),
     fetchPositions(),
+    fetchRoles(),
   ]);
   fetchEmployees();
 });
@@ -540,6 +607,7 @@ const form = ref<any>({
   email: "",
   department_id: null,
   position_id: null,
+  role: null,
   bank_name: "",
   bank_account: "",
   status: 1,
@@ -592,6 +660,7 @@ const handleAddEmployee = () => {
     email: "",
     department_id: null,
     position_id: null,
+    role: null,
     bank_name: "",
     bank_account: "",
     status: 1,
@@ -629,6 +698,7 @@ const handleEdit = async (employee: Employee) => {
       position_id: data.position_id ? Number(data.position_id) : null,
       bank_name: data.bank_name || data.bankName || '',
       bank_account: data.bank_account || data.bankAccount || '',
+      role: data.role || null,
       status: data.status || 1,
       tenant_id: data.tenant_id || tenantId,
     };
@@ -799,6 +869,7 @@ const submitForm = async () => {
         email: form.value.email,
         department_id: form.value.department_id || 0,
         position_id: form.value.position_id || 0,
+        role: form.value.role || 0,
         bank_name: form.value.bank_name || '',
         bank_account: form.value.bank_account || '',
         status: form.value.status,
@@ -821,22 +892,21 @@ const submitForm = async () => {
       fetchEmployees();
     } else {
       // 构建提交数据
+      const tenantId = getCurrentTenantId();
       const submitData: any = {
+        tenant_id: tenantId || form.value.tenant_id || 0,
         employee_no: form.value.employeeNo,
         name: form.value.name,
-        phone: form.value.phone,
-        email: form.value.email,
+        phone: form.value.phone || '',
+        email: form.value.email || '',
         department_id: form.value.department_id || 0,
         position_id: form.value.position_id || 0,
+        role: form.value.role || 0,
         bank_name: form.value.bank_name || '',
         bank_account: form.value.bank_account || '',
-        status: form.value.status,
+        status: form.value.status || 1,
       };
       
-      if (form.value.tenant_id) {
-        submitData.tenant_id = form.value.tenant_id;
-      }
-      
       await addEmployee(submitData);
       ElMessage.success({
         message: "添加成功",
diff --git a/pc/src/views/login/index.vue b/pc/src/views/login/index.vue
index 5cca7be..ded9711 100644
--- a/pc/src/views/login/index.vue
+++ b/pc/src/views/login/index.vue
@@ -3,7 +3,7 @@ import { ref, onMounted } from "vue";
 import { useRouter } from "vue-router";
 import { useAuthStore } from "@/stores/auth";
 import { login } from "@/api/login";
-import { getAllMenus } from "@/api/menu";
+import { getAllMenus, getTenantMenus } from "@/api/menu";
 
 const router = useRouter();
 const authStore = useAuthStore();
@@ -77,7 +77,20 @@ const handleLogin = async () => {
       
       // 登录成功后缓存菜单
       try {
-        const menuRes = await getAllMenus();
+        const userInfo = res.data.user || {};
+        const loginType = userInfo.type; // "user" 或 "employee"
+        const roleId = userInfo.role; // 角色ID
+        
+        let menuRes;
+        // 判断是租户登录（员工）还是用户登录
+        if (loginType === "employee" && roleId) {
+          // 员工登录，使用getTenantMenus接口，根据角色权限过滤菜单
+          menuRes = await getTenantMenus(roleId);
+        } else {
+          // 用户登录，使用getAllMenus接口（获取所有菜单）
+          menuRes = await getAllMenus();
+        }
+        
         if (menuRes && menuRes.data && menuRes.data.length > 0) {
           localStorage.setItem('menu_cache', JSON.stringify(menuRes.data));
         }
diff --git a/pc/src/views/system/users/index.vue b/pc/src/views/system/users/index.vue
index 43de445..981cf06 100644
--- a/pc/src/views/system/users/index.vue
+++ b/pc/src/views/system/users/index.vue
@@ -232,6 +232,8 @@ import {
   changePassword,
 } from "@/api/user";
 import { getRoleByTenantId } from "@/api/role";
+import { getTenantDepartments } from "@/api/department";
+import { getTenantPositions, getPositionsByDepartment } from "@/api/position";
 import { useAuthStore } from "@/stores/auth";
 
 interface User {
diff --git a/server/controllers/auth.go b/server/controllers/auth.go
index 65bece1..1260a99 100644
--- a/server/controllers/auth.go
+++ b/server/controllers/auth.go
@@ -91,7 +91,8 @@ func (c *AuthController) Login() {
 				"avatar":    user.Avatar,
 				"nickname":  user.Nickname,
 				"tenant_id": user.TenantId,
-				"type":      "user", // 标识是用户登录
+				"role":      user.Role, // 角色ID
+				"type":      "user",   // 标识是用户登录
 			}
 		} else if employee != nil {
 			// 员工登录
@@ -107,7 +108,8 @@ func (c *AuthController) Login() {
 				"tenant_id":    employee.TenantId,
 				"department_id": employee.DepartmentId,
 				"position_id":  employee.PositionId,
-				"type":         "employee", // 标识是员工登录
+				"role":         employee.Role, // 角色ID
+				"type":         "employee",   // 标识是员工登录
 			}
 		} else {
 			c.Data["json"] = map[string]interface{}{
diff --git a/server/controllers/employee.go b/server/controllers/employee.go
index 3e1d0cc..650bb0f 100644
--- a/server/controllers/employee.go
+++ b/server/controllers/employee.go
@@ -61,18 +61,21 @@ func (c *EmployeeController) GetTenantEmployees() {
 	employeeList := make([]map[string]interface{}, 0)
 	for _, emp := range employees {
 		employeeList = append(employeeList, map[string]interface{}{
-			"id":           emp.Id,
-			"tenant_id":    emp.TenantId,
-			"employee_no": emp.EmployeeNo,
-			"name":         emp.Name,
-			"phone":        emp.Phone,
-			"email":        emp.Email,
+			"id":             emp.Id,
+			"tenant_id":      emp.TenantId,
+			"employee_no":   emp.EmployeeNo,
+			"name":           emp.Name,
+			"phone":          emp.Phone,
+			"email":          emp.Email,
 			"department_id": emp.DepartmentId,
-			"position_id":  emp.PositionId,
-			"bank_name":    emp.BankName,
-			"bank_account": emp.BankAccount,
-			"status":       emp.Status,
-			"create_time":  emp.CreateTime,
+			"position_id":   emp.PositionId,
+			"role":           emp.Role,
+			"bank_name":     emp.BankName,
+			"bank_account":  emp.BankAccount,
+			"status":         emp.Status,
+			"create_time":    emp.CreateTime,
+			"last_login_time": emp.LastLoginTime,
+			"last_login_ip":   emp.LastLoginIp,
 		})
 	}
 
@@ -109,24 +112,27 @@ func (c *EmployeeController) GetEmployeeInfo() {
 		return
 	}
 
-	c.Data["json"] = map[string]interface{}{
-		"code":    0,
-		"message": "获取员工信息成功",
-		"data": map[string]interface{}{
-			"id":           employee.Id,
-			"tenant_id":    employee.TenantId,
-			"employee_no": employee.EmployeeNo,
-			"name":         employee.Name,
-			"phone":        employee.Phone,
-			"email":        employee.Email,
-			"department_id": employee.DepartmentId,
-			"position_id":  employee.PositionId,
-			"bank_name":    employee.BankName,
-			"bank_account": employee.BankAccount,
-			"status":       employee.Status,
-			"create_time":  employee.CreateTime,
-		},
-	}
+		c.Data["json"] = map[string]interface{}{
+			"code":    0,
+			"message": "获取员工信息成功",
+			"data": map[string]interface{}{
+				"id":             employee.Id,
+				"tenant_id":      employee.TenantId,
+				"employee_no":    employee.EmployeeNo,
+				"name":           employee.Name,
+				"phone":          employee.Phone,
+				"email":          employee.Email,
+				"department_id":  employee.DepartmentId,
+				"position_id":    employee.PositionId,
+				"role":           employee.Role,
+				"bank_name":      employee.BankName,
+				"bank_account":   employee.BankAccount,
+				"status":         employee.Status,
+				"create_time":    employee.CreateTime,
+				"last_login_time": employee.LastLoginTime,
+				"last_login_ip":   employee.LastLoginIp,
+			},
+		}
 	c.ServeJSON()
 }
 
@@ -141,9 +147,10 @@ func (c *EmployeeController) AddEmployee() {
 		Email        string `json:"email"`
 		DepartmentId int    `json:"department_id"`
 		PositionId   int    `json:"position_id"`
+		Role         int    `json:"role"`
 		BankName     string `json:"bank_name"`
 		BankAccount  string `json:"bank_account"`
-		Status       int8   `json:"status"`
+		Status       int    `json:"status"` // 使用int，前端传递number会自动转换
 	}
 
 	err := json.Unmarshal(c.Ctx.Input.RequestBody, &employeeData)
@@ -165,16 +172,25 @@ func (c *EmployeeController) AddEmployee() {
 		Email:        employeeData.Email,
 		DepartmentId: employeeData.DepartmentId,
 		PositionId:   employeeData.PositionId,
+		Role:         employeeData.Role,
 		BankName:     employeeData.BankName,
 		BankAccount:  employeeData.BankAccount,
-		Status:       employeeData.Status,
+		Status:       int8(employeeData.Status), // 转换为int8
 	}
 
-	// 如果没有指定租户ID，从当前登录用户获取（需要JWT中间件支持）
-	// 这里暂时使用传入的tenant_id，如果为0则使用默认值
+	// 如果没有指定租户ID，从JWT token中获取
 	if employee.TenantId == 0 {
-		// 可以从JWT token中获取租户ID，这里暂时设为1作为默认值
-		employee.TenantId = 1
+		if tenantId, ok := c.Ctx.Input.GetData("tenantId").(int); ok && tenantId > 0 {
+			employee.TenantId = tenantId
+		} else {
+			c.Data["json"] = map[string]interface{}{
+				"code":    1,
+				"message": "租户ID不能为空",
+				"data":    nil,
+			}
+			c.ServeJSON()
+			return
+		}
 	}
 
 	// 默认密码
@@ -220,9 +236,10 @@ func (c *EmployeeController) UpdateEmployee() {
 		Email        string `json:"email"`
 		DepartmentId int    `json:"department_id"`
 		PositionId   int    `json:"position_id"`
+		Role         int    `json:"role"`
 		BankName     string `json:"bank_name"`
 		BankAccount  string `json:"bank_account"`
-		Status       int8   `json:"status"`
+		Status       int    `json:"status"` // 使用int，前端传递number会自动转换
 	}
 
 	err = json.Unmarshal(c.Ctx.Input.RequestBody, &updateData)
@@ -254,9 +271,10 @@ func (c *EmployeeController) UpdateEmployee() {
 	employee.Email = updateData.Email
 	employee.DepartmentId = updateData.DepartmentId
 	employee.PositionId = updateData.PositionId
+	employee.Role = updateData.Role
 	employee.BankName = updateData.BankName
 	employee.BankAccount = updateData.BankAccount
-	employee.Status = updateData.Status
+	employee.Status = int8(updateData.Status) // 转换为int8
 
 	if err := models.UpdateEmployee(employee); err != nil {
 		c.Data["json"] = map[string]interface{}{
diff --git a/server/controllers/knowledge.go b/server/controllers/knowledge.go
index fa99877..944731e 100644
--- a/server/controllers/knowledge.go
+++ b/server/controllers/knowledge.go
@@ -23,9 +23,18 @@ func (c *KnowledgeController) List() {
 	categoryId, _ := c.GetInt("categoryId", 0)
 	share, _ := c.GetInt8("share", -1) // Default -1 to query all
 	keyword := c.GetString("keyword", "")
+	
+	// 获取租户ID（如果是员工登录，从JWT token中获取）
+	tenantId := 0
+	if tenantIdVal, ok := c.Ctx.Input.GetData("tenantId").(int); ok && tenantIdVal > 0 {
+		// 检查是否是员工登录（type === "employee"）
+		if userType, ok := c.Ctx.Input.GetData("userType").(string); ok && userType == "employee" {
+			tenantId = tenantIdVal
+		}
+	}
 
 	// Use share in the query
-	knowledges, total, err := models.GetAllKnowledge(page, pageSize, status, categoryId, share, keyword)
+	knowledges, total, err := models.GetAllKnowledge(page, pageSize, status, categoryId, share, keyword, tenantId)
 	if err != nil {
 		c.Data["json"] = map[string]interface{}{
 			"code":    1,
@@ -62,8 +71,17 @@ func (c *KnowledgeController) Detail() {
 		c.ServeJSON()
 		return
 	}
+	
+	// 获取租户ID（如果是员工登录，从JWT token中获取）
+	tenantId := 0
+	if tenantIdVal, ok := c.Ctx.Input.GetData("tenantId").(int); ok && tenantIdVal > 0 {
+		// 检查是否是员工登录（type === "employee"）
+		if userType, ok := c.Ctx.Input.GetData("userType").(string); ok && userType == "employee" {
+			tenantId = tenantIdVal
+		}
+	}
 
-	knowledge, err := models.GetKnowledgeById(id)
+	knowledge, err := models.GetKnowledgeById(id, tenantId)
 	if err != nil {
 		c.Data["json"] = map[string]interface{}{
 			"code":    1,
@@ -112,6 +130,14 @@ func (c *KnowledgeController) Create() {
 	// Add share parsing (default 0 for personal)
 	share, _ := c.GetInt8("share", 0)
 	knowledge.Share = share
+	
+	// 获取租户ID（如果是员工登录，从JWT token中获取并设置）
+	if tenantIdVal, ok := c.Ctx.Input.GetData("tenantId").(int); ok && tenantIdVal > 0 {
+		// 检查是否是员工登录（type === "employee"）
+		if userType, ok := c.Ctx.Input.GetData("userType").(string); ok && userType == "employee" {
+			knowledge.TenantId = tenantIdVal
+		}
+	}
 
 	id, err := models.AddKnowledge(&knowledge)
 	if err != nil {
@@ -158,12 +184,17 @@ func (c *KnowledgeController) Update() {
 		c.ServeJSON()
 		return
 	}
+	
+	// 获取租户ID（如果是员工登录，从JWT token中获取）
+	tenantId := 0
+	if tenantIdVal, ok := c.Ctx.Input.GetData("tenantId").(int); ok && tenantIdVal > 0 {
+		// 检查是否是员工登录（type === "employee"）
+		if userType, ok := c.Ctx.Input.GetData("userType").(string); ok && userType == "employee" {
+			tenantId = tenantIdVal
+		}
+	}
 
-	// Add share parsing
-	share, _ := c.GetInt8("share", 0) // Default 0 if not provided
-	knowledge.Share = share
-
-	err = models.UpdateKnowledge(knowledge.Id, &knowledge)
+	err = models.UpdateKnowledge(knowledge.Id, &knowledge, tenantId)
 	if err != nil {
 		c.Data["json"] = map[string]interface{}{
 			"code":    1,
@@ -216,8 +247,17 @@ func (c *KnowledgeController) Delete() {
 	if deleteBy == "" {
 		deleteBy = "system" // 默认值
 	}
+	
+	// 获取租户ID（如果是员工登录，从JWT token中获取）
+	tenantId := 0
+	if tenantIdVal, ok := c.Ctx.Input.GetData("tenantId").(int); ok && tenantIdVal > 0 {
+		// 检查是否是员工登录（type === "employee"）
+		if userType, ok := c.Ctx.Input.GetData("userType").(string); ok && userType == "employee" {
+			tenantId = tenantIdVal
+		}
+	}
 
-	err = models.DeleteKnowledge(int(id), deleteBy)
+	err = models.DeleteKnowledge(int(id), deleteBy, tenantId)
 	if err != nil {
 		c.Data["json"] = map[string]interface{}{
 			"code":    1,
@@ -239,7 +279,16 @@ func (c *KnowledgeController) Delete() {
 // GetCategories 获取分类列表
 // @router /api/knowledge/categories [get]
 func (c *KnowledgeController) GetCategories() {
-	categories, err := models.GetAllCategories()
+	// 获取租户ID（如果是员工登录，从JWT token中获取）
+	tenantId := 0
+	if tenantIdVal, ok := c.Ctx.Input.GetData("tenantId").(int); ok && tenantIdVal > 0 {
+		// 检查是否是员工登录（type === "employee"）
+		if userType, ok := c.Ctx.Input.GetData("userType").(string); ok && userType == "employee" {
+			tenantId = tenantIdVal
+		}
+	}
+	
+	categories, err := models.GetAllCategories(tenantId)
 	if err != nil {
 		c.Data["json"] = map[string]interface{}{
 			"code":    1,
@@ -275,7 +324,16 @@ func (c *KnowledgeController) GetCategories() {
 // GetTags 获取标签列表
 // @router /api/knowledge/tags [get]
 func (c *KnowledgeController) GetTags() {
-	tags, err := models.GetAllTags()
+	// 获取租户ID（如果是员工登录，从JWT token中获取）
+	tenantId := 0
+	if tenantIdVal, ok := c.Ctx.Input.GetData("tenantId").(int); ok && tenantIdVal > 0 {
+		// 检查是否是员工登录（type === "employee"）
+		if userType, ok := c.Ctx.Input.GetData("userType").(string); ok && userType == "employee" {
+			tenantId = tenantIdVal
+		}
+	}
+	
+	tags, err := models.GetAllTags(tenantId)
 	if err != nil {
 		c.Data["json"] = map[string]interface{}{
 			"code":    1,
@@ -322,6 +380,14 @@ func (c *KnowledgeController) AddCategory() {
 		c.ServeJSON()
 		return
 	}
+	
+	// 获取租户ID（如果是员工登录，从JWT token中获取并设置）
+	if tenantIdVal, ok := c.Ctx.Input.GetData("tenantId").(int); ok && tenantIdVal > 0 {
+		// 检查是否是员工登录（type === "employee"）
+		if userType, ok := c.Ctx.Input.GetData("userType").(string); ok && userType == "employee" {
+			category.TenantId = tenantIdVal
+		}
+	}
 
 	// 不处理id，直接添加，表自动递增
 	_, err = models.AddCategory(&category)
@@ -357,6 +423,14 @@ func (c *KnowledgeController) AddTag() {
 		c.ServeJSON()
 		return
 	}
+	
+	// 获取租户ID（如果是员工登录，从JWT token中获取并设置）
+	if tenantIdVal, ok := c.Ctx.Input.GetData("tenantId").(int); ok && tenantIdVal > 0 {
+		// 检查是否是员工登录（type === "employee"）
+		if userType, ok := c.Ctx.Input.GetData("userType").(string); ok && userType == "employee" {
+			tag.TenantId = tenantIdVal
+		}
+	}
 
 	// 判断是添加还是更新
 	if tag.TagId > 0 {
diff --git a/server/controllers/menu.go b/server/controllers/menu.go
index f80e57a..5989aa0 100644
--- a/server/controllers/menu.go
+++ b/server/controllers/menu.go
@@ -34,6 +34,38 @@ func (c *MenuController) GetAllMenus() {
 	c.ServeJSON()
 }
 
+// GetTenantMenus 根据角色获取租户菜单（只返回该角色有权限的菜单）
+// @router /menus/tenant/:roleId [get]
+func (c *MenuController) GetTenantMenus() {
+	roleId, err := c.GetInt(":roleId")
+	if err != nil || roleId <= 0 {
+		c.Data["json"] = map[string]interface{}{
+			"success": false,
+			"message": "角色ID无效",
+			"data":    nil,
+		}
+		c.ServeJSON()
+		return
+	}
+
+	menus, err := models.GetTenantMenus(roleId)
+	if err != nil {
+		c.Data["json"] = map[string]interface{}{
+			"success": false,
+			"message": "获取菜单失败: " + err.Error(),
+			"data":    nil,
+		}
+	} else {
+		c.Data["json"] = map[string]interface{}{
+			"success": true,
+			"message": "获取菜单成功",
+			"data":    menus,
+		}
+	}
+
+	c.ServeJSON()
+}
+
 // CreateMenu 创建新菜单
 func (c *MenuController) CreateMenu() {
 	var menu models.Menu
diff --git a/server/controllers/user.go b/server/controllers/user.go
index 926197a..7705fc3 100644
--- a/server/controllers/user.go
+++ b/server/controllers/user.go
@@ -77,6 +77,8 @@ func (c *UserController) GetTenantUsers() {
 			"tenant_id":       user.TenantId,
 			"status":          user.Status,
 			"role":            user.Role,
+			"department_id":   user.DepartmentId,
+			"position_id":     user.PositionId,
 			"last_login_time": user.LastLoginTime,
 			"last_login_ip":   user.LastLoginIp,
 		})
diff --git a/server/middleware/jwt.go b/server/middleware/jwt.go
index 4fc3429..c5fe659 100644
--- a/server/middleware/jwt.go
+++ b/server/middleware/jwt.go
@@ -64,5 +64,13 @@ func JWTAuthMiddleware() web.FilterFunc {
 	ctx.Input.SetData("userId", claims.UserID)
 	ctx.Input.SetData("username", claims.Username)
 	ctx.Input.SetData("tenantId", claims.TenantId)
+	
+	// 判断用户类型：检查userId是否在员工表中
+	// 如果userId在yz_tenant_employees表中存在，则为员工登录；否则为用户登录
+	userType := "user"
+	if models.IsEmployee(claims.UserID) {
+		userType = "employee"
+	}
+	ctx.Input.SetData("userType", userType)
 }
 }
diff --git a/server/models/employee.go b/server/models/employee.go
index b646caa..96bd61e 100644
--- a/server/models/employee.go
+++ b/server/models/employee.go
@@ -21,6 +21,7 @@ type Employee struct {
 	Email        string     `orm:"size(100);null" json:"email"`
 	DepartmentId int        `orm:"column(department_id);null;default(0)" json:"department_id"`
 	PositionId   int        `orm:"column(position_id);null;default(0)" json:"position_id"`
+	Role         int        `orm:"column(role);null;default(0)" json:"role"` // 角色ID
 	BankName     string     `orm:"column(bank_name);size(100);null" json:"bank_name"`
 	BankAccount  string     `orm:"column(bank_account);size(50);null" json:"bank_account"`
 	Password      string     `orm:"size(255);null" json:"-"` // 不返回给前端
@@ -121,7 +122,7 @@ func AddEmployee(employee *Employee, defaultPassword string) (int64, error) {
 // UpdateEmployee 更新员工信息
 func UpdateEmployee(employee *Employee) error {
 	o := orm.NewOrm()
-	_, err := o.Update(employee, "employee_no", "name", "phone", "email", "department_id", "position_id", "bank_name", "bank_account", "status", "update_time")
+	_, err := o.Update(employee, "employee_no", "name", "phone", "email", "department_id", "position_id", "role", "bank_name", "bank_account", "status", "update_time")
 	return err
 }
 
@@ -240,3 +241,18 @@ func GetAllEmployees() ([]*Employee, error) {
 	return employees, err
 }
 
+// IsEmployee 检查指定的ID是否是员工（用于判断登录类型）
+func IsEmployee(id int) bool {
+	o := orm.NewOrm()
+	employee := &Employee{Id: id}
+	err := o.Read(employee)
+	if err != nil {
+		return false
+	}
+	// 检查是否已删除
+	if employee.DeleteTime != nil {
+		return false
+	}
+	return true
+}
+
diff --git a/server/models/knowledge.go b/server/models/knowledge.go
index 813eb07..0a81c71 100644
--- a/server/models/knowledge.go
+++ b/server/models/knowledge.go
@@ -9,6 +9,7 @@ import (
 // Knowledge 知识库模型
 type Knowledge struct {
 	Id           int       `orm:"column(knowledge_id);pk;auto" json:"id"`
+	TenantId     int       `orm:"column(tenant_id);default(0)" json:"tenantId"`
 	Title        string    `orm:"column(title);size(200)" json:"title"`
 	CategoryId   int       `orm:"column(category_id);default(0);null" json:"categoryId"`
 	CategoryName string    `orm:"-" json:"categoryName"` // 不映射到数据库，从联查获取
@@ -39,6 +40,7 @@ func (k *Knowledge) TableName() string {
 // KnowledgeCategory 知识库分类模型
 type KnowledgeCategory struct {
 	CategoryId   int       `orm:"column(category_id);pk;auto" json:"categoryId"`
+	TenantId     int       `orm:"column(tenant_id);default(0)" json:"tenantId"`
 	CategoryName string    `orm:"column(category_name);size(100)" json:"categoryName"`
 	CategoryDesc string    `orm:"column(category_desc);size(500);null" json:"categoryDesc"`
 	ParentId     int       `orm:"column(parent_id);default(0)" json:"parentId"`
@@ -55,7 +57,8 @@ func (kc *KnowledgeCategory) TableName() string {
 // KnowledgeTag 知识库标签模型
 type KnowledgeTag struct {
 	TagId         int       `orm:"column(tag_id);pk;auto" json:"tagId"`
-	TagName       string    `orm:"column(tag_name);size(50);unique" json:"tagName"`
+	TenantId      int       `orm:"column(tenant_id);default(0)" json:"tenantId"`
+	TagName       string    `orm:"column(tag_name);size(50)" json:"tagName"`
 	TagColor      string    `orm:"column(tag_color);size(20);null" json:"tagColor"`
 	TagBackground string    `orm:"column(tag_background);size(20);null" json:"tagBackground"`
 	UsageCount    int       `orm:"column(usage_count);default(0)" json:"usageCount"`
@@ -76,7 +79,7 @@ func AddKnowledge(k *Knowledge) (int64, error) {
 }
 
 // GetKnowledgeById 根据ID获取知识详情（使用联查获取分类名称）
-func GetKnowledgeById(id int) (*Knowledge, error) {
+func GetKnowledgeById(id int, tenantId int) (*Knowledge, error) {
 	o := orm.NewOrm()
 
 	// 使用联查获取分类名称（只查询未删除的记录）
@@ -86,6 +89,13 @@ func GetKnowledgeById(id int) (*Knowledge, error) {
 		LEFT JOIN yz_knowledge_category c ON k.category_id = c.category_id 
 		WHERE k.knowledge_id = ? AND k.delete_time IS NULL
 	`
+	params := []interface{}{id}
+	
+	// 如果tenantId > 0，添加租户过滤
+	if tenantId > 0 {
+		querySQL += " AND k.tenant_id = ?"
+		params = append(params, tenantId)
+	}
 
 	var result struct {
 		Id           int       `orm:"column(knowledge_id)"`
@@ -108,7 +118,7 @@ func GetKnowledgeById(id int) (*Knowledge, error) {
 		UpdateBy     string    `orm:"column(update_by)"`
 	}
 
-	err := o.Raw(querySQL, id).QueryRow(&result)
+	err := o.Raw(querySQL, params...).QueryRow(&result)
 	if err != nil {
 		return nil, err
 	}
@@ -165,11 +175,17 @@ func addCondition(where *string, params *[]interface{}, cond string, val interfa
 }
 
 // GetAllKnowledge (simplified: direct mapping to LightKnowledge, no separate struct or loop)
-func GetAllKnowledge(page, pageSize int, status int8, categoryId int, share int8, keyword string) ([]*LightKnowledge, int64, error) {
+func GetAllKnowledge(page, pageSize int, status int8, categoryId int, share int8, keyword string, tenantId int) ([]*LightKnowledge, int64, error) {
 	o := orm.NewOrm()
 
 	whereSQL := "delete_time IS NULL"
 	params := []interface{}{}
+	
+	// 如果tenantId > 0，添加租户过滤
+	if tenantId > 0 {
+		whereSQL += " AND k.tenant_id = ?"
+		params = append(params, tenantId)
+	}
 
 	addCondition(&whereSQL, &params, "status = ?", func() interface{} {
 		if status >= 0 {
@@ -197,7 +213,7 @@ func GetAllKnowledge(page, pageSize int, status int8, categoryId int, share int8
 	}())
 
 	var total int64
-	err := o.Raw("SELECT COUNT(*) FROM yz_knowledge WHERE "+whereSQL, params).QueryRow(&total)
+	err := o.Raw("SELECT COUNT(*) FROM yz_knowledge k WHERE "+whereSQL, params).QueryRow(&total)
 	if err != nil {
 		return nil, 0, err
 	}
@@ -217,13 +233,18 @@ func GetAllKnowledge(page, pageSize int, status int8, categoryId int, share int8
 }
 
 // UpdateKnowledge 更新知识
-func UpdateKnowledge(id int, k *Knowledge) error {
+func UpdateKnowledge(id int, k *Knowledge, tenantId int) error {
 	o := orm.NewOrm()
 	knowledge := &Knowledge{Id: id}
 	err := o.Read(knowledge)
 	if err != nil {
 		return err
 	}
+	
+	// 如果tenantId > 0，验证租户ID是否匹配
+	if tenantId > 0 && knowledge.TenantId != tenantId {
+		return orm.ErrNoRows // 返回无记录错误，表示该知识不属于当前租户
+	}
 
 	// 更新字段
 	knowledge.Title = k.Title
@@ -234,22 +255,28 @@ func UpdateKnowledge(id int, k *Knowledge) error {
 	knowledge.Summary = k.Summary
 	knowledge.CoverUrl = k.CoverUrl
 	knowledge.Status = k.Status
+	knowledge.Share = k.Share
 	knowledge.IsRecommend = k.IsRecommend
 	knowledge.IsTop = k.IsTop
 	knowledge.UpdateBy = k.UpdateBy
 
-	_, err = o.Update(knowledge, "title", "category_id", "tags", "author", "content", "summary", "cover_url", "status", "is_recommend", "is_top", "update_by", "update_time")
+	_, err = o.Update(knowledge, "title", "category_id", "tags", "author", "content", "summary", "cover_url", "status", "share", "is_recommend", "is_top", "update_by", "update_time")
 	return err
 }
 
 // DeleteKnowledge 软删除知识
-func DeleteKnowledge(id int, deleteBy string) error {
+func DeleteKnowledge(id int, deleteBy string, tenantId int) error {
 	o := orm.NewOrm()
 	knowledge := &Knowledge{Id: id}
 	err := o.Read(knowledge)
 	if err != nil {
 		return err
 	}
+	
+	// 如果tenantId > 0，验证租户ID是否匹配
+	if tenantId > 0 && knowledge.TenantId != tenantId {
+		return orm.ErrNoRows // 返回无记录错误，表示该知识不属于当前租户
+	}
 
 	// 执行软删除：设置 delete_time 和 delete_by
 	_, err = o.Raw("UPDATE yz_knowledge SET delete_time = ?, delete_by = ? WHERE knowledge_id = ?", time.Now(), deleteBy, id).Exec()
@@ -257,10 +284,17 @@ func DeleteKnowledge(id int, deleteBy string) error {
 }
 
 // GetAllCategories 获取所有分类
-func GetAllCategories() ([]*KnowledgeCategory, error) {
+func GetAllCategories(tenantId int) ([]*KnowledgeCategory, error) {
 	o := orm.NewOrm()
+	qs := o.QueryTable("yz_knowledge_category")
+	
+	// 如果tenantId > 0，添加租户过滤
+	if tenantId > 0 {
+		qs = qs.Filter("tenant_id", tenantId)
+	}
+	
 	var categories []*KnowledgeCategory
-	_, err := o.QueryTable("yz_knowledge_category").OrderBy("sort_order").All(&categories)
+	_, err := qs.OrderBy("sort_order").All(&categories)
 	return categories, err
 }
 
@@ -273,10 +307,17 @@ func GetCategoryById(id int) (*KnowledgeCategory, error) {
 }
 
 // GetAllTags 获取所有标签
-func GetAllTags() ([]*KnowledgeTag, error) {
+func GetAllTags(tenantId int) ([]*KnowledgeTag, error) {
 	o := orm.NewOrm()
+	qs := o.QueryTable("yz_knowledge_tags")
+	
+	// 如果tenantId > 0，添加租户过滤
+	if tenantId > 0 {
+		qs = qs.Filter("tenant_id", tenantId)
+	}
+	
 	var tags []*KnowledgeTag
-	_, err := o.QueryTable("yz_knowledge_tags").All(&tags)
+	_, err := qs.All(&tags)
 	return tags, err
 }
 
diff --git a/server/models/menu.go b/server/models/menu.go
index 25b8da6..79fbc66 100644
--- a/server/models/menu.go
+++ b/server/models/menu.go
@@ -1,6 +1,7 @@
 package models
 
 import (
+	"strings"
 	"time"
 
 	"github.com/beego/beego/v2/client/orm"
@@ -96,3 +97,70 @@ func DeleteMenu(id int) error {
 	_, err := o.Update(&menu, "DeleteTime")
 	return err
 }
+
+// GetTenantMenus 根据角色ID获取租户菜单（只返回该角色有权限的菜单，且只返回页面菜单menu_type=1）
+func GetTenantMenus(roleId int) ([]map[string]interface{}, error) {
+	o := orm.NewOrm()
+	
+	// 如果角色ID为0或无效，返回空列表
+	if roleId <= 0 {
+		return []map[string]interface{}{}, nil
+	}
+	
+	// 1. 从yz_role_menus表获取该角色的所有菜单ID
+	var menuIds []int
+	_, err := o.Raw("SELECT DISTINCT menu_id FROM yz_role_menus WHERE role_id = ?", roleId).QueryRows(&menuIds)
+	if err != nil {
+		return nil, err
+	}
+	
+	// 如果没有权限，返回空列表
+	if len(menuIds) == 0 {
+		return []map[string]interface{}{}, nil
+	}
+	
+	// 2. 构建IN查询的占位符
+	placeholders := make([]string, len(menuIds))
+	args := make([]interface{}, len(menuIds)+1)
+	for i, id := range menuIds {
+		placeholders[i] = "?"
+		args[i] = id
+	}
+	args[len(menuIds)] = 1 // menu_type=1 表示页面菜单
+	
+	// 3. 查询菜单（只返回menu_type=1的页面菜单，且未删除的）
+	query := "SELECT id, name, path, parent_id, icon, `order`, status, component_path, is_external, external_url, menu_type, permission " +
+		"FROM yz_menus " +
+		"WHERE id IN (" + strings.Join(placeholders, ",") + ") " +
+		"AND delete_time IS NULL " +
+		"AND menu_type = ? " +
+		"ORDER BY `order`, id"
+	
+	var menus []*Menu
+	_, err = o.Raw(query, args...).QueryRows(&menus)
+	if err != nil {
+		return nil, err
+	}
+	
+	// 4. 转换为map格式
+	result := make([]map[string]interface{}, 0, len(menus))
+	for _, m := range menus {
+		item := map[string]interface{}{
+			"id":            m.Id,
+			"name":          m.Name,
+			"path":          m.Path,
+			"parentId":      m.ParentId,
+			"icon":          m.Icon,
+			"order":         m.Order,
+			"status":        m.Status,
+			"componentPath": m.ComponentPath,
+			"isExternal":    m.IsExternal,
+			"externalUrl":   m.ExternalUrl,
+			"menuType":      m.MenuType,
+			"permission":    m.Permission,
+		}
+		result = append(result, item)
+	}
+	
+	return result, nil
+}
diff --git a/server/routers/router.go b/server/routers/router.go
index f76bd52..faa39b1 100644
--- a/server/routers/router.go
+++ b/server/routers/router.go
@@ -249,6 +249,7 @@ func init() {
 	beego.Router("/api/menu/:id", &controllers.MenuController{}, "put:UpdateMenu")
 	beego.Router("/api/menu/:id", &controllers.MenuController{}, "delete:DeleteMenu")
 	beego.Router("/api/menu/status/:id", &controllers.MenuController{}, "patch:UpdateMenuStatus")
+	beego.Router("/api/menus/tenant/:roleId", &controllers.MenuController{}, "get:GetTenantMenus")
 
 	// 程序分类路由 - 自动映射到 /api/programcategory/*
 	beego.AutoRouter(&controllers.ProgramCategoryController{})