From bb937075c6695530b7972b7fbe9b3e6c0207e786 Mon Sep 17 00:00:00 2001
From: chensg <ch@qq.com>
Date: Tue, 17 Jun 2025 17:40:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E6=9C=BA=E6=9E=84=E5=8F=82=E6=95=B0=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/report/Employeelearning.vue | 33 +++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/src/views/report/Employeelearning.vue b/src/views/report/Employeelearning.vue
index 73be0304..2bd6381a 100644
--- a/src/views/report/Employeelearning.vue
+++ b/src/views/report/Employeelearning.vue
@@ -234,13 +234,19 @@ export default {
   //请求组织接口
     const getOrgList = async () => {
       var manageFlag = false;
-      for(let i=0;i<store.state.userInfo.roleList.length;i++){
-        if(store.state.userInfo.roleList[i].roleCode=="system-admin"){
-          manageFlag = true;
-          break;
+      if (store.state.userInfo != null && store.state.userInfo.roleList != null) {
+        for(let i=0;i<store.state.userInfo.roleList.length;i++){
+          if(store.state.userInfo.roleList[i].roleCode=="system-admin"){
+            manageFlag = true;
+            break;
+          }
         }
       }
+      
       const res = await api.userGetUserOrg({});
+      if (res != null && res.data != null && res.data.result != null && res.data.result.orgTreeList != null) {
+        orgArray = flattenOrgTree(res.data.result.orgTreeList);
+      }
       if (res) {
         if(manageFlag){
           state.option = [{
@@ -268,6 +274,25 @@ export default {
         getTableData();
       }
     };
+    
+    function flattenOrgTree(orgTree) {
+      const result = [];
+
+      function traverse(node) {
+        if (node.organizationId && node.orgName) {
+          result.push({
+            organizationId: node.organizationId,
+            orgName: node.orgName
+          });
+        }
+        if (node.childList && node.childList.length > 0) {
+          node.childList.forEach(child => traverse(child));
+        }
+      }
+
+      orgTree.forEach(node => traverse(node));
+      return result;
+    }
     //导出
     const exportbtnz = async () => {
       if (!state.selectedRowKeys?.length) {