@sy-common/organize-select-help 1.0.0-beta.26 → 1.0.0-beta.29

package/src/index.vue

@@ -121,32 +121,54 @@
               </div>
             </TabPane>
             <TabPane label="选择人员" name="staff" v-if="name.includes('staff')">
-              <div class="tab">
-                <Input v-model="staffSearch" @on-enter="searchStaff" @on-search="searchStaff" search placeholder="搜索人员"/>
-                <div style="position:relative;">
-                  <div class="tree staff-content" @scroll="handleScroll">
-                    <!-- 关键修改：用“index + 下划线 + item.id”做key，确保唯一且不影响数据 -->
-                    <div :class="['gust-item',item.checked && 'staff-active']"
-                         v-for="(item, index) in staffAllList"
-                         :key="`staff_${index}_${item.id}`"
-                    @click="handlestaff(item)">
-                    <div class="left-panel">{{item.name && item.name.slice(0,1) || ''}}</div>
-                    <div class="right-panel">
-                      <p>{{item.name}}</p>
-                      <p>{{item.orgNodeName || item.orgUnitName}}</p>
+              <div class="tab staff-left-right-layout">
+                <!-- 左侧：组织选择区域（限制高度） -->
+                <div class="staff-left-panel">
+                  <div class="panel-title">组织选择</div>
+                  <div class="tree staff-org-tree">
+                    <organizeTree
+                        @handleChange="getStaffList"
+                        ref="staffTree"
+                        :treeList="staffTree"
+                        :showCheckbox="true"
+                        :checkStrictly="true"
+                        :autoExpandParent="true"
+                        :isSingleSelect="true"
+                    ></organizeTree>
+                  </div>
+                </div>
+
+                <div class="staff-right-panel">
+                  <Input v-model="staffSearch" @on-enter="searchStaff" @on-search="searchStaff" search placeholder="搜索人员"/>
+                  <div style="position:relative;">
+                    <div class="tree staff-content" @scroll="handleScroll">
+                      <div :class="['gust-item',item.checked && 'staff-active']"
+                           v-for="(item, index) in staffAllList"
+                           :key="`staff_${index}_${item.id}`"
+                           @click="handlestaff(item)">
+                        <Checkbox
+                            v-model="item.checked"
+                            class="staff-checkbox"
+                            @click.stop="() => handlestaff(item)"
+                        ></Checkbox>
+                        <div class="left-panel">{{item.name && item.name.slice(0,1) || ''}}</div>
+                        <div class="right-panel">
+                          <p>{{item.name}}</p>
+                          <p>{{item.orgNodeName || item.orgUnitName}}</p>
+                        </div>
+<!--                        <div class="checked-icon" v-show="item.checked">✔</div>-->
+                      </div>
+                      <p v-if="staffEnding" style="color:#CCCCCC;text-align: center">---我也是有底线的---</p>
                     </div>
-                    <div class="checked-icon" v-show="item.checked">✔</div>
+                    <Spin v-if="loadingStaff" size="large" fix />
+                  </div>
+                  <div class="bottom-select">
+                    <div>当前已选择 <span class="num">{{getCheckedStaff}}</span>人</div>
+                    <Button type="primary" icon="md-add" @click="addStaffList">添加人员</Button>
                   </div>
-                  <p v-if="staffEnding" style="color:#CCCCCC;text-align: center">---我也是有底线的---</p>
                 </div>
-                <Spin v-if="loadingStaff" size="large" fix />
-              </div>
-              <div class="bottom-select">
-                <div>当前已选择 <span class="num">{{getCheckedStaff}}</span>人</div>
-                <Button type="primary" icon="md-add" @click="addStaffList">添加人员</Button>
               </div>
-        </div>
-        </TabPane>
+            </TabPane>
           </Tabs>
         </div>
         <div class="form-content">
@@ -264,14 +286,69 @@ export default {
       selectedPositionId: null, // 新增：岗位单选的选中状态存储
       selectedOrgTagKey: '', // 存储选中标签的唯一标识
       selectedPostTagKey: '', // 存储选中标签的唯一标识
+      //人员选择
+      staffTree:[],
+      staffTagList:[],
+      staffOrgList:[],
+      staffSearchList:[],
+      selectedStaffOrgId: '', // 新增：选中的组织节点ID
+      proStaffOrgList: [] // 新增：暂存选中的组织节点
     }
   },
   mounted() {
     this.queryTagList()
     this.queryPositionList()
     // this.loadMore()
+    this.initStaffOrgTree()
   },
   methods:{
+    async initStaffOrgTree() {
+      try {
+        // 关键修复：初始化时重置选中状态
+        this.$set(this, 'selectedStaffOrgId', '');
+        this.proStaffOrgList = [];
+
+        const rootOrgId = this.defaultOrgUnitId || '';
+        let rootNode = null;
+
+        if (rootOrgId) {
+          const leafNode = await this.judgeNodeLeafe(rootOrgId);
+          const orgDetail = await this.queryOrgNodeDetail(rootOrgId);
+          rootNode = this.safeDeepCopy({
+            ...orgDetail,
+            orgNodeName: orgDetail.orgNodeName || orgDetail.name,
+            leafNode,
+            expand: true,
+            parentOrgUnitId: orgDetail.parentOrgUnitId || orgDetail.parentId
+          });
+        } else {
+          const res = await ajax.get('/pub-manage-server/pub/personHelpBox/q/getOrgUnitList', {
+            params: { containsCurLevel: true }
+          });
+          if (res.data.code === 1) {
+            rootNode = res.data.data[0] || null;
+            if (rootNode) {
+              rootNode.expand = true;
+              rootNode.parentOrgUnitId = rootNode.parentId;
+            }
+          }
+        }
+
+        if (rootNode) {
+          let parentsList = await this.getParentOrgNodesByOrgUnitId(rootNode.orgUnitId);
+          const safeParents = this.safeDeepCopy(parentsList);
+          safeParents.forEach(node => {
+            node.expand = true;
+            node.parentOrgUnitId = node.parentId;
+          });
+          const tree = this.buildTree([...safeParents, rootNode]);
+          this.staffTree = this.safeDeepCopy(tree);
+        }
+      } catch (e) {
+        this.$Message.error("人员选择组织树初始化失败！");
+        console.error(e);
+      }
+    },
     handlePostTagSelect(quickPickKey) {
       // 清空暂存列表
       this.proPostList = [];
@@ -490,6 +567,30 @@ export default {
         this.$Message.error("获取组织节点列表失败！");
       }
     },
+    async getStaffOption(val) {
+      this.staffOrgList = [];
+      if(!val) return this.$refs.staffTree.initData();
+      let item = this.staffSearchList.filter((item)=> item.orgUnitId === val).shift();
+      if (!item) return;
+
+      const leafNode = await this.judgeNodeLeafe(item.orgUnitId);
+      const ftem = this.safeDeepCopy({
+        ...item,
+        orgNodeName: item.name,
+        parentOrgUnitId: item.parentId,
+        leafNode: leafNode
+      });
+
+      try{
+        let parentsList = await this.getParentOrgNodesByOrgUnitId(val);
+        // 对父节点列表进行安全拷贝
+        const safeParents = this.safeDeepCopy(parentsList);
+        let tree = this.buildTree([...safeParents, ftem]);
+        this.staffTree = this.safeDeepCopy(tree);
+      }catch(e){
+        this.$Message.error("获取组织节点列表失败！");
+      }
+    },
     getParentOrgNodesByOrgUnitId(val){
       return new Promise((resolve,reject)=>{
         ajax.get('/pub-manage-server/pub/personHelpBox/q/getParentOrgNodesByOrgUnitId?orgUnitId='+val).then((res)=>{
@@ -552,28 +653,44 @@ export default {
 
     searchStaff(){
       this.staffEnding = false;
-      this.offset = 0
-      this.staffAllList = []
-      this.loadMore()
+      this.offset = 0;
+      this.staffAllList = [];
+      // 关键修复：50ms延迟，解决极端情况下的异步更新问题
+      setTimeout(() => {
+        this.loadMore();
+      }, 50);
     },
-    queryAllStaffList(){
-      return new Promise((resolve,reject)=>{
-          ajax.get('/pub-manage-server/pub/personHelpBox/q/queryAllStaffList',{
-            params:{
-              search:this.staffSearch,
-              offset:this.offset,
-              limit:10,
-              baComOrgCode:this.defaultOrgUnitId
-            }
-          }).then((res)=>{
-            if(res.data.code === 1){
-              let resp = res.data.data
-              resolve(resp)
-            }else{
-              reject(false)
-            }
-          })
-      })
+    queryAllStaffList() {
+      const params = {
+        search: this.staffSearch,
+        offset: this.offset,
+        limit: 10
+      };
+
+      // 关键优化：实时监测选中状态，未选中时显式传递空字符串（而非不传递）
+      if (this.selectedStaffOrgId && typeof this.selectedStaffOrgId === 'string' && this.selectedStaffOrgId.trim()) {
+        params.orgUnitId = this.selectedStaffOrgId.trim();
+      } else {
+        // 未选中任何节点时，显式设置orgUnitId为空字符串
+        params.orgUnitId = '';
+      }
+
+      // 调试日志：查看最终传递的参数
+      console.log('人员查询接口参数:', params);
+
+      return new Promise((resolve, reject) => {
+        ajax.get('/pub-manage-server/pub/personHelpBox/q/queryAllStaffList', {
+          params: params
+        }).then((res) => {
+          if (res.data.code === 1) {
+            resolve(res.data.data);
+          } else {
+            reject(false);
+          }
+        }).catch((err) => {
+          reject(err);
+        });
+      });
     },
     handleScroll(e){
       const { scrollTop, clientHeight, scrollHeight } = e.target;
@@ -603,45 +720,135 @@ export default {
         console.log(e)
       }
     },
-    getOrgList(data){
-      if (this.proOrgList){
-        this.proOrgList = this.proOrgList.concat(data)
-      }else {
-        this.proOrgList = data
-      }
+    getOrgList(data) {
+      // 过滤有效节点：仅要求orgUnitId（orgNodeName可选，用默认值兜底）
+      const validNodes = Array.isArray(data)
+          ? data.filter(node => node.orgUnitId) // 仅校验orgUnitId（必选）
+          : [];
+
+      // 去重：基于orgUnitId避免重复
+      const uniqueNodes = validNodes.filter((node, index, self) =>
+          self.findIndex(item => item.orgUnitId === node.orgUnitId) === index
+      );
+
+      // 补全缺失字段，避免后续处理报错
+      const completeNodes = uniqueNodes.map(node => ({
+        ...node,
+        orgNodeName: node.orgNodeName || node.name || `未命名组织(${node.orgUnitId})`,
+        orgUnitName: node.orgNodeName || node.name || `未命名组织(${node.orgUnitId})`
+      }));
+
+      // 安全深拷贝，确保数据响应式
+      this.proOrgList = this.safeDeepCopy(completeNodes);
+    },
 
+    getPostList(data) {
+      // 过滤有效节点：仅要求orgUnitId
+      const validNodes = Array.isArray(data)
+          ? data.filter(node => node.orgUnitId)
+          : [];
+
+      // 去重：基于orgUnitId
+      const uniqueNodes = validNodes.filter((node, index, self) =>
+          self.findIndex(item => item.orgUnitId === node.orgUnitId) === index
+      );
+
+      // 补全缺失字段
+      const completeNodes = uniqueNodes.map(node => ({
+        ...node,
+        orgNodeName: node.orgNodeName || node.name || `未命名组织(${node.orgUnitId})`,
+        orgUnitName: node.orgNodeName || node.name || `未命名组织(${node.orgUnitId})`
+      }));
+
+      // 覆盖暂存列表（而非concat，避免累积无效数据）
+      this.proPostList = this.safeDeepCopy(completeNodes);
     },
-    getPostList(data){
-      if (this.proPostList){
-        this.proPostList = this.proPostList.concat(data)
-      }else {
-        this.proPostList = data
+    getStaffList(data) {
+      if (!Array.isArray(data) || data.length === 0) {
+        this.proStaffOrgList = [];
+        // 强制清空并触发响应式更新
+        this.$set(this, 'selectedStaffOrgId', '');
+        // 立即触发搜索，确保orgUnitId参数实时更新为空
+        this.$nextTick(() => this.searchStaff());
+        return;
       }
+
+      // 关键修复1：过滤仅含有效orgUnitId的节点，排除无效数据
+      const validNodes = data.filter(node =>
+          node.orgUnitId && typeof node.orgUnitId === 'string' // 确保orgUnitId存在且为字符串
+      );
+
+      if (validNodes.length === 0) {
+        this.$Message.warning("所选节点无效，请重新选择");
+        this.proStaffOrgList = [];
+        this.$set(this, 'selectedStaffOrgId', '');
+        // 立即触发搜索，更新参数为空
+        this.$nextTick(() => this.searchStaff());
+        return;
+      }
+
+      // 关键修复2：单选逻辑强化，仅保留最后一个有效选中节点
+      const currentNode = validNodes[validNodes.length - 1];
+      const currentOrgUnitId = currentNode.orgUnitId.trim(); // 去除空格，避免无效字符串
+
+      // 补全节点字段，确保orgUnitId绝对存在
+      const pureNode = this.safeDeepCopy({
+        ...currentNode,
+        orgNodeName: currentNode.orgNodeName || currentNode.name || `未命名组织(${currentOrgUnitId})`,
+        orgUnitName: currentNode.orgNodeName || currentNode.name || `未命名组织(${currentOrgUnitId})`
+      });
+
+      // 清除子节点引用，避免循环引用导致的更新延迟
+      if (pureNode.orgChildrenList) pureNode.orgChildrenList = [];
+      if (pureNode.children) pureNode.children = [];
+
+      // 关键修复3：强制响应式更新，避免Vue数据延迟
+      this.$set(this, 'proStaffOrgList', [pureNode]);
+      this.$set(this, 'selectedStaffOrgId', currentOrgUnitId);
+
+      // 关键修复4：双重nextTick确保数据完全更新后再查询
+      this.$nextTick(() => {
+        if (this.selectedStaffOrgId !== currentOrgUnitId) {
+          this.$set(this, 'selectedStaffOrgId', currentOrgUnitId);
+          this.$nextTick(() => this.searchStaff());
+        } else {
+          this.searchStaff();
+        }
+        console.log('人员选择-当前选中orgUnitId:', this.selectedStaffOrgId); // 调试日志
+      });
     },
+
     addOrgList() {
-      if(!this.proOrgList.length) return this.$Message.error("请先选择组织节点！")
-      let proOrgList = deepCopy(this.proOrgList)
-      proOrgList.forEach(item=>{
-        item.title = this.includeLevelOrg.includes('01')?`${item.orgNodeName}（包含下级组织节点）`:item.orgNodeName
-        item.id = this.includeLevelOrg.includes('01')?('01'+'-' + item.orgUnitId):('00'+'-'+item.orgUnitId)
-        item.includeLevel = this.includeLevelOrg.includes('01')
-      })
-      let list = this.orgList.concat(proOrgList)
+      // 过滤空节点（仅校验orgUnitId）
+      const validOrgList = this.proOrgList.filter(node => node.orgUnitId);
+      if (!validOrgList.length) return this.$Message.error("请先选择组织节点！");
+
+      let proOrgList = deepCopy(validOrgList);
+      proOrgList.forEach(item => {
+        // 用补全后的orgNodeName，避免空显示
+        item.title = this.includeLevelOrg.includes('01')
+            ? `${item.orgNodeName}（包含下级组织节点）`
+            : item.orgNodeName;
+        item.id = this.includeLevelOrg.includes('01')
+            ? (`01-${item.orgUnitId}`)
+            : (`00-${item.orgUnitId}`);
+        item.includeLevel = this.includeLevelOrg.includes('01');
+      });
+
+      // 去重合并
+      let list = this.orgList.concat(proOrgList);
       let uniqueArray = list.filter((item, index, self) =>
-              index === self.findIndex(t => (
-                  t.id === item.id // 基于id属性去重
-              ))
+          index === self.findIndex(t => t.id === item.id)
       );
-      this.orgList = uniqueArray
+      this.orgList = uniqueArray;
 
-      // 新增：清空组织树节点选中状态（关键优化）
+      // 清空选中状态
       if (this.$refs.orgTree && this.$refs.orgTree.clearAllChecked) {
         this.$refs.orgTree.clearAllChecked(this.$refs.orgTree.data);
-        this.$refs.orgTree.$emit('handleChange', []); // 通知父组件清空暂存列表
+        this.$refs.orgTree.$emit('handleChange', []);
       }
-
-      this.$refs.orgTree.upDataTree()
-      this.proOrgList = []
+      this.$refs.orgTree.upDataTree();
+      this.proOrgList = [];
     },
     clearGroup(){
       this.orgList = []
@@ -655,39 +862,42 @@ export default {
       this.selectedPositionId = item.positionId
     },
     addPostList() {
-      if(!this.proPostList.length) return this.$Message.error("请选择组织节点！")
-      let proPostList = deepCopy(this.proPostList)
+      // 过滤空节点
+      const validPostList = this.proPostList.filter(node => node.orgUnitId);
+      if (!validPostList.length) return this.$Message.error("请选择组织节点！");
+
       let checkedPosition = this.positiontList.find(item => item.positionId === this.selectedPositionId);
-      if(!checkedPosition){return this.$Message.error("请选择岗位！！")}
-      // summary data
-      let totalList = []
-      proPostList.forEach(item=>{
+      if (!checkedPosition) { return this.$Message.error("请选择岗位！"); }
+
+      let totalList = [];
+      validPostList.forEach(item => {
         totalList.push({
           ...item,
           ...checkedPosition,
-          title:`${this.includeLevelPost.length?(item.orgNodeName+'（包含下级组织节点）'):item.orgNodeName}`,
-          includeLevel:this.includeLevelPost.includes('01'),
-          id:this.includeLevelPost.includes('01')?('01'+'-'+checkedPosition.positionId + '-' + item.orgUnitId):('00'+'-'+checkedPosition.positionId + '-' + item.orgUnitId),
-        })
-      })
-      let list = this.postList.concat(totalList)
+          title: `${this.includeLevelPost.length ? (item.orgNodeName + '（包含下级组织节点）') : item.orgNodeName}`,
+          includeLevel: this.includeLevelPost.includes('01'),
+          id: this.includeLevelPost.includes('01')
+              ? (`01-${checkedPosition.positionId}-${item.orgUnitId}`)
+              : (`00-${checkedPosition.positionId}-${item.orgUnitId}`),
+        });
+      });
+
+      // 去重合并
+      let list = this.postList.concat(totalList);
       let uniqueArray = list.filter((item, index, self) =>
-              index === self.findIndex(t => (
-                  t.id === item.id // 基于id属性去重
-              ))
+          index === self.findIndex(t => t.id === item.id)
       );
-      this.postList = uniqueArray
+      this.postList = uniqueArray;
 
-      // 新增：清空岗位树节点选中状态（关键优化）
+      // 清空选中状态
       if (this.$refs.postTree && this.$refs.postTree.clearAllChecked) {
         this.$refs.postTree.clearAllChecked(this.$refs.postTree.data);
-        this.$refs.postTree.$emit('handleChange', []); // 通知父组件清空暂存列表
+        this.$refs.postTree.$emit('handleChange', []);
       }
-
-      this.$refs.postTree.upDataTree()
-      this.proPostList = []
-      this.selectedPositionId = null; // 清空岗位单选状态
-      this.$refs.postTree.initData()
+      this.$refs.postTree.upDataTree();
+      this.proPostList = [];
+      this.selectedPositionId = null;
+      // this.$refs.postTree.initData();
       this.selectedPostTagKey = '';
     },
     clearPost(){
@@ -699,14 +909,18 @@ export default {
     //staff
     addStaffList(){
       let staffList = this.staffAllList.filter((item)=>item.checked===true);
+      if (!staffList.length) {
+        this.$Message.error("请选择人员");
+        return;
+      }
       // 关键优化：基于item.id去重，不修改原数据字段，仅过滤重复项
       let uniqueStaffList = staffList.filter(newItem =>
           // 检查右侧条件区域（staffList）是否已有该人员，避免重复添加
           !this.staffList.some(existItem => existItem.userId === newItem.userId)
       );
-      // 合并去重后的列表，右侧条件区域数据结构完全不变
+      // 合并去重后的列表
       this.staffList = this.staffList.concat(uniqueStaffList);
-      // 清空选中状态（保持原有逻辑）
+      // 清空选中状态
       this.staffAllList.forEach(item => item.checked = false);
     },
     handlestaff(item){
@@ -726,8 +940,8 @@ export default {
       }
       this.$emit('confirm',deepCopy(v))
     },
-    visibleChange(val){
-      this.$emit('input',val);
+    visibleChange(val) {
+      this.$emit('input', val);
       // val 为 true 时表示帮助框打开，此时发起请求
       if (val) {
         this.initStaffList() // 新增初始化方法，统一处理打开后的请求逻辑
@@ -736,19 +950,38 @@ export default {
         this.staffEnding = false;
         this.offset = 0;
         this.staffAllList = [];
+        // 关闭时重置选中状态
+        this.$set(this, 'selectedStaffOrgId', '');
       }
     },
     initStaffList() {
       this.staffEnding = false;
       this.offset = 0;
       this.staffAllList = [];
+      // 初始化时确保selectedStaffOrgId状态正确
+      if (this.tabName === 'staff' && (!this.selectedStaffOrgId || this.selectedStaffOrgId.trim())) {
+        this.$set(this, 'selectedStaffOrgId', '');
+      }
       this.loadMore(); // 打开帮助框后，再发起第一次请求
     },
     // 处理Tab切换，同步更新tabName
     handleTabChange(tabName) {
       this.tabName = tabName;
-      // 可选：切换到岗位Tab时，初始化岗位树选中状态（避免残留组织Tab数据）
-      if (tabName === 'post' && this.$refs.postTree && this.proPostList.length === 0) {
+
+      // 仅修改人员Tab相关逻辑，不影响其他Tab
+      if (tabName === 'staff') {
+        // 重置人员选择相关状态
+        this.$set(this, 'selectedStaffOrgId', '');
+        this.proStaffOrgList = [];
+        // 清空树组件选中状态
+        if (this.$refs.staffTree) {
+          this.$refs.staffTree.clearAllChecked(this.$refs.staffTree.data);
+          this.$refs.staffTree.$emit('handleChange', []);
+        }
+        // 切换到人员tab时，立即触发一次搜索，确保orgUnitId参数正确
+        this.$nextTick(() => this.searchStaff());
+      } else if (tabName === 'post' && this.$refs.postTree && this.proPostList.length === 0) {
+        // 保留原有岗位Tab逻辑，不修改
         this.proPostList = [];
         this.$refs.postTree.initData();
       }
@@ -1099,9 +1332,14 @@ export default {
         return obj;
       }
 
-      // 检测到循环引用时，仅保留基础字段
+      // 检测到循环引用时，保留核心字段（orgUnitId必选，其他字段尽可能保留）
       if (hash.has(obj)) {
-        const safeObj = { orgUnitId: obj.orgUnitId, name: obj.name || obj.orgNodeName };
+        const safeObj = {
+          orgUnitId: obj.orgUnitId,
+          orgNodeName: obj.orgNodeName || obj.name || `未命名组织(${obj.orgUnitId || 'unknown'})`,
+          orgUnitName: obj.orgUnitName || obj.orgNodeName || obj.name || `未命名组织(${obj.orgUnitId || 'unknown'})`,
+          parentOrgUnitId: obj.parentOrgUnitId || obj.parentId || null
+        };
         hash.set(obj, safeObj);
         return safeObj;
       }
@@ -1118,14 +1356,15 @@ export default {
         hash.set(obj, copy);
         for (let key in obj) {
           if (obj.hasOwnProperty(key)) {
-            // 严格过滤可能导致循环的字段
-            if (['parent', '__parent', 'parentNode', '__vue__', '__ob__', '$parent'].includes(key)) {
+            // 仅过滤vue内部字段，保留业务字段
+            if (['__vue__', '__ob__', '$parent', '$children'].includes(key)) {
               continue;
             }
-            // 对子节点数组进行特殊处理
+            // 子节点数组特殊处理
             if (['orgChildrenList', 'children'].includes(key) && Array.isArray(obj[key])) {
               copy[key] = obj[key].map(child => this.safeDeepCopy(child, hash));
             } else {
+              // 保留所有业务字段，不额外过滤
               copy[key] = this.safeDeepCopy(obj[key], hash);
             }
           }
@@ -1176,25 +1415,20 @@ export default {
         return null;
       }
 
-      // 用队列实现广度优先搜索（BFS），避免递归栈溢出
       const queue = [...treeData];
       while (queue.length > 0) {
-        const currentNode = queue.shift(); // 取出队列头部节点
-        // 找到目标节点，直接返回
-        if (currentNode.orgUnitId === targetOrgUnitId) {
+        const currentNode = queue.shift();
+        // 兼容子组件可能的字段映射（orgUnitId可能存储在id字段）
+        const nodeId = currentNode.orgUnitId || currentNode.id || '';
+        if (nodeId === targetOrgUnitId) {
           return currentNode;
         }
-        // 将当前节点的子节点加入队列（继续查找）
-        if (Array.isArray(currentNode.orgChildrenList) && currentNode.orgChildrenList.length > 0) {
-          queue.push(...currentNode.orgChildrenList);
-        }
-        // 兼容子组件可能使用的children字段
-        if (Array.isArray(currentNode.children) && currentNode.children.length > 0 && !currentNode.orgChildrenList) {
-          queue.push(...currentNode.children);
+        // 兼容children和orgChildrenList两种子节点字段
+        const childNodes = currentNode.orgChildrenList || currentNode.children || [];
+        if (childNodes.length > 0) {
+          queue.push(...childNodes);
         }
       }
-
-      // 遍历完所有节点未找到
       return null;
     },
 
@@ -1316,6 +1550,146 @@ export default {
 }
 </script>
 <style lang="less" scoped>
+// 新增checkbox样式
+.staff-checkbox {
+  margin-right: 12px;
+  flex-shrink: 0;
+
+  /deep/ .ivu-checkbox-wrapper {
+    display: flex;
+    align-items: center;
+    cursor: pointer;
+  }
+
+  /deep/ .ivu-checkbox {
+    width: 18px;
+    height: 18px;
+
+    &:checked {
+      /deep/ .ivu-checkbox-inner {
+        background-color: var(--primary-color);
+        border-color: var(--primary-color);
+      }
+    }
+  }
+}
+.staff-left-right-layout {
+  display: flex;
+  height: 600px;
+  gap: 15px;
+  padding: 0 5px;
+  width: 100%;
+  box-sizing: border-box;
+
+  .staff-left-panel {
+    min-width: 300px;
+    max-width: 350px;
+    width: 320px;
+    display: flex;
+    flex-direction: column;
+    box-sizing: border-box;
+    flex-shrink: 0;
+
+    .panel-title {
+      font-weight: 600;
+      font-size: 15px;
+      color: #1f2937;
+      margin-bottom: 10px;
+      height: 28px;
+      display: flex;
+      align-items: center;
+      position: relative;
+      padding-left: 18px; // 内边距同步加宽2px，保持视觉平衡
+      // 调整竖线宽度为6px，更醒目且仍符合整体简约风格
+      &::before {
+        content: '';
+        position: absolute;
+        left: 0;
+        top: 50%;
+        transform: translateY(-50%);
+        width: 6px; // 从3px调整为6px，加宽竖线
+        height: 18px; // 高度同步微调至18px，比例更协调
+        background-color: var(--primary-color);
+        border-radius: 3px; // 圆角保持3px，视觉更柔和
+      }
+    }
+
+    .staff-org-tree {
+      height: calc(100% - 38px) !important; // 对应title高度+margin-bottom调整
+      overflow: auto;
+      border: 1px solid #EAECF0;
+      border-radius: 4px;
+      padding: 8px;
+      box-sizing: border-box;
+      // 保持原有树节点样式
+      /deep/ .ivu-tree-node-content {
+        white-space: normal !important;
+        line-height: 1.4;
+        padding: 4px 0;
+      }
+      /deep/ .ivu-tree-node {
+        padding-left: 4px !important;
+      }
+      /deep/ .ivu-tree-child-tree {
+        padding-left: 16px !important;
+      }
+    }
+  }
+
+  .staff-right-panel {
+    flex: 1 !important;
+    min-width: 350px;
+    width: calc(100% - 335px) !important;
+    display: flex;
+    flex-direction: column;
+    box-sizing: border-box;
+    gap: 8px;
+    padding: 0 5px;
+    flex-shrink: 0;
+
+    // 其他右侧样式保持不变...
+  }
+}
+
+// 其他原有样式保持不变
+/deep/ .ivu-tree {
+  width: 100% !important;
+  box-sizing: border-box;
+}
+
+/deep/ .ivu-tree-node-content {
+  width: 100% !important;
+  box-sizing: border-box;
+}
+
+.gust-item {
+  display: flex;
+  align-items: center;
+  width: 100% !important;
+  padding: 12px 12px;
+  margin-top: 8px;
+  cursor: pointer;
+  box-sizing: border-box;
+  border: none !important; // 强制移除默认边框
+}
+
+// 恢复滚动条样式（确保滚动可见）
+.staff-content::-webkit-scrollbar {
+  width: 8px !important;
+  height: 8px;
+  display: block !important;
+}
+
+.staff-content::-webkit-scrollbar-thumb {
+  background-color: #ccc !important;
+  border-radius: 4px !important;
+}
+
+.staff-content::-webkit-scrollbar-track {
+  background-color: #f9f9f9 !important;
+}
+
+// 其他原有样式保持不变
 .tab.post .left {
   width: 200px;
   height: 450px !important;
@@ -1325,38 +1699,35 @@ export default {
 }
 
 .scroll-container {
-  height: 100% !important; /* 完全填充父容器高度 */
-  overflow-y: auto !important; /* 内容超出时显示滚动条，不足时隐藏（也可设为scroll强制显示） */
+  height: 100% !important;
+  overflow-y: auto !important;
   overflow-x: hidden !important;
   padding: 8px 0;
-  /* 消除可能的内边距/外边距影响 */
   margin: 0;
   box-sizing: border-box;
 }
 
-/* 3. 强化滚动条样式，确保可见性（兼容webkit浏览器） */
 .scroll-container::-webkit-scrollbar {
-  width: 8px !important; /* 滚动条宽度，确保肉眼可见 */
+  width: 8px !important;
   height: 8px;
-  display: block !important; /* 强制显示滚动条容器，避免被隐藏 */
+  display: block !important;
 }
 
 .scroll-container::-webkit-scrollbar-thumb {
-  background-color: #ccc !important; /* 滑块颜色，与背景区分明显 */
+  background-color: #ccc !important;
   border-radius: 4px !important;
   transition: background-color 0.2s;
 }
 
 .scroll-container::-webkit-scrollbar-thumb:hover {
-  background-color: #999 !important; /* hover时加深，增强交互感 */
+  background-color: #999 !important;
 }
 
 .scroll-container::-webkit-scrollbar-track {
-  background-color: #f9f9f9 !important; /* 轨道颜色，与容器背景区分 */
+  background-color: #f9f9f9 !important;
   border-radius: 4px !important;
 }
 
-/* 4. 保持position-item原有样式，确保布局正常 */
 .position-item {
   border: 1px solid #ddd;
   margin: 5px 0;
@@ -1364,13 +1735,12 @@ export default {
   border-radius: 2px;
   cursor: pointer;
   transition: background-color 0.2s;
-  /* 取消文字截断，允许自动换行 */
-  white-space: normal !important; /* 关键：取消强制不换行，恢复默认自动换行 */
-  overflow: visible !important; /* 关键：取消内容隐藏，展示全部文字 */
-  text-overflow: clip !important; /* 取消省略号，显示完整文字 */
-  line-height: 1.4; /* 优化行高，换行后文字更易读 */
-  min-height: 40px; /* 给个最小高度，避免内容过少时容器过扁 */
-  word-wrap: break-word; /* 兼容长英文/数字，强制换行（防止横向溢出） */
+  white-space: normal !important;
+  overflow: visible !important;
+  text-overflow: clip !important;
+  line-height: 1.4;
+  min-height: 40px;
+  word-wrap: break-word;
 }
 
 .position-item.active {
@@ -1381,45 +1751,42 @@ export default {
 .position-item:hover:not(.active) {
   background-color: #f5f5f5;
 }
+
 .custom-select-wrapper {
   position: relative;
 
-  /* 优化清空按钮样式 */
   /deep/ .ivu-select-clear {
-    right: 32px;  /* 调整位置，避免与下拉箭头重叠 */
+    right: 32px;
     color: #999;
     font-size: 16px;
-    opacity: 1 !important;  /* 始终显示（有值时） */
+    opacity: 1 !important;
     transition: all 0.2s ease;
 
     &:hover {
-      color: #ff4d4f;  /* hover时变红 */
-      transform: scale(1.1);  /* 轻微放大效果 */
+      color: #ff4d4f;
+      transform: scale(1.1);
     }
   }
 
-  /* 调整下拉箭头位置 */
   /deep/ .ivu-select-arrow {
     right: 12px;
   }
 
-  /* 优化输入框内边距，避免文字被按钮遮挡 */
   /deep/ .ivu-select-input {
     padding-right: 45px !important;
   }
 
-  /* 选中选项样式 */
   /deep/ .active-option {
     background-color: #f2f8ff;
     color: var(--primary-color);
   }
 
-  /* 无数据选项样式 */
   /deep/ .ivu-select-option-disabled {
     color: #ccc !important;
     background: #f5f5f5 !important;
   }
 }
+
 .tag-select-container {
   margin-left: 10px;
 
@@ -1439,6 +1806,7 @@ export default {
     text-overflow: ellipsis;
   }
 }
+
 .modal-tree{
   .header-text{
     font-weight: bold;
@@ -1597,10 +1965,15 @@ export default {
           font-size:18px;
         }
       }
-      .staff-active{
-        background:#E9F4FF;
-        >p:first-child{
-          color: var(--primary-color);
+      .staff-active {
+        background: transparent !important; // 彻底移除背景色
+        border: none !important; // 彻底移除边框高亮
+        border-radius: 0 !important; // 移除圆角
+
+        > .right-panel > p:first-child {
+          color: inherit !important; // 可选：也移除文字颜色变化，仅保留Checkbox选中
+          // 如果需要保留文字变色，删除上面这行，保留下面注释的行
+          // color: var(--primary-color);
         }
       }
     }