From f1dccc314ee987f9794d74a15ebda4c0de53b3bb Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Tue, 15 Oct 2024 15:50:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E7=AE=A1=E7=90=86=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=96=B0=E5=A2=9E=E8=AE=B2=E5=B8=88=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/Lecturer.js                      |  4 ++--
 src/components/project/SearchTeacher.vue | 14 +++++---------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/api/Lecturer.js b/src/api/Lecturer.js
index a4dec238..6c0bc7cd 100644
--- a/src/api/Lecturer.js
+++ b/src/api/Lecturer.js
@@ -54,6 +54,6 @@ export const updateOutTeacher = (obj) => http.post('/admin/teacher/updateOutTeac
 
 export const fileUp = (obj) => http.post('/file/upload', obj)
 //组织树查询讲师
-export const getTeacherByDepartId = (obj) => http.post(`/admin/teacher/getTeacherByDepartId?organizationId=${obj.organizationId}`)
+export const getTeacherByDepartId = (obj) => http.get(`/admin/thirdApi/user/list?departId=${obj.organizationId}&pageNo=1&pageSize=1000&keyword=`)
 //根据姓名工号查询讲师
-export const getTeacherByNameOrUserNo = (obj) => http.post(`/admin/teacher/getTeacherByNameOrUserNo?nameOrUserNo=${obj.nameOrUserNo}`)
+export const getTeacherByNameOrUserNo = (obj) => http.get(`/admin/thirdApi/user/list?keyword=${obj.nameOrUserNo}&pageNo=1&pageSize=50&departId=`)
diff --git a/src/components/project/SearchTeacher.vue b/src/components/project/SearchTeacher.vue
index 7f9bd844..0d4a5371 100644
--- a/src/components/project/SearchTeacher.vue
+++ b/src/components/project/SearchTeacher.vue
@@ -109,7 +109,6 @@ const systemName = ref('')
 const levelName = ref('')
 const neworgName = ref('')
 const handleChange = (e,l) => {
-  console.log(e,l,'handlechange');
   isOpen.value = false
   // emit('update:value',e)
   teacherName.value = e
@@ -120,7 +119,6 @@ const handleChange = (e,l) => {
           neworgName.value= orgName.value.split('/')
           neworgName.value=  neworgName.value[ neworgName.value.length-1]
         } 
-  console.log(neworgName,'handlechange');
 };
 function debounce(func, wait) {
   let timeout;
@@ -142,12 +140,10 @@ const searchMembers = (keyword) => {
   }
 };
 const searchMember = (keyword) => {
-  console.log(keyword,'keyword')
   getTeacherByNameOrUserNo({nameOrUserNo:keyword}).then((res) => {
-    console.log(res,'res')
     if(res.data.code == 200){
       loading.value = false
-      options.value = res.data.data.map((item) => {
+      options.value = res.data.data.list.map((item) => {
         return {
           value: item.realName,
           label: item.realName+'('+item.userNo+')'+item.orgName,
@@ -179,19 +175,19 @@ const { data: treeData, loading: orgLoading } = useRequest(
   { keyword: "" },
 );
 function onLoadData(treeNode) {
-  console.log(treeNode, "treeNode")
   teacherById.value = treeNode.id
   const promises = [];
   const childDatas = []
   promises.push(
     getTeacherByDepartId({organizationId:teacherById.value}).then((res) => {
       if(res.data.code == 200){
-        res.data.data.map(item=>{
+        res.data.data.list.map(item=>{
           return (
-            item.isLeaf = true
+            item.isLeaf = true,
+            item.name = item.realName
           )
         })
-        childDatas.unshift(...res.data.data)
+        childDatas.unshift(...res.data.data.list)
       }
     }).catch((err)=>{
       console.log(err,'err')