Merge branch 'dev' of https://git.citupro.com/zhengnaiwen_citu/menduner-admin into dev

src/views/menduner/system/person/details/components/attachment.vue

@@ -59,6 +59,7 @@ const getList = async () => {
 
 watch(() => props.userId, (newVal) => {
   if (newVal) {
+    queryParams.userId = newVal
     getList()
   }
 }, { immediate: true }, { deep: true })

src/views/menduner/system/person/details/components/expExtend.vue

@@ -88,6 +88,7 @@ const getExpList = async () => {
 
 watch(() => props.userId, (newVal) => {
   if (newVal) {
+    queryParams.userId = newVal
     getExpList()
   }
 }, { immediate: true }, { deep: true })

src/views/menduner/system/talentMap/maintenance/gather/components/data.js

@@ -73,13 +73,13 @@ export default {
 	],
 	'招聘': [
 		{
-			"name_zh": "招聘1",
+			"name_zh": "樊登登",
 			"checked": true,
 			"id": '1793583467288223745',
 			"userId": 1
 		},
 		{
-			"name_zh": '招聘2',
+			"name_zh": '尹世丹',
 			"checked": true,
 			"id": '1843906600113389570',
 			"userId": '598525227328212992'

src/views/menduner/system/talentMap/maintenance/gather/components/search.vue

@@ -233,7 +233,7 @@ const detail = (row) => {
     message.warning('已经被添加，请勿重复添加 ！')
     return
   }
-  addList.value.push({ id: row.id, userId: row.userId, name: row.name })
+  addList.value.push({ id: row.id, userId: row.userId, name: row.name, name_zh: row.name })
   message.success('已添加到选择列表！')
   // emit('detail', { id: row.id, userId: row.userId, name: row.name })
 }