diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/DepartmentResourceController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/DepartmentResourceController.php
index f124744..d695feb 100644
--- a/Laravel/app/Http/Controllers/API/Admin/YeWu/DepartmentResourceController.php
+++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/DepartmentResourceController.php
@@ -35,7 +35,31 @@ public function GetEnableList(Request $request)
         }
         if(isset($userInfo->department_id)) $department_id=$userInfo->department_id;
         if(isset($res_department_id))  $department_id=$res_department_id;
-        $resource=DB::table('s_department_resources')->where(['department_id'=>$department_id,'department_resources_status'=>1,'is_del'=>0])->orderBy('id')->get();
+
+        // 查询当前科室，判断是否为工作台科室
+        $department = DB::table('s_department')->where(['id' => $department_id, 'is_del' => 0])->first();
+        $queryDeptIds = [$department_id];
+        if ($department && $department->is_workbench == 1) {
+            // 工作台科室：从 linked_departments 解析关联科室，并合并其子科室
+            $linkedIds = json_decode($department->linked_departments, true);
+            if (!empty($linkedIds) && is_array($linkedIds)) {
+                $linkedDeptIds = DB::table('s_department')
+                    ->where('is_del', 0)
+                    ->where(function($q) use ($linkedIds) {
+                        $q->whereIn('id', $linkedIds)
+                          ->orWhereIn('pid', $linkedIds);
+                    })
+                    ->pluck('id')
+                    ->toArray();
+                $queryDeptIds = array_unique(array_merge($queryDeptIds, $linkedDeptIds));
+            }
+        }
+
+        $resource = DB::table('s_department_resources')
+            ->whereIn('department_id', $queryDeptIds)
+            ->where('department_resources_status', 1)
+            ->where('is_del', 0)
+            ->orderBy('id')->get();
         foreach($resource as $k=>$v){
             $v->time_range=json_decode($v->time_range,true);
         }
diff --git a/YiJi-admin/src/views/Info/EntrustList.vue b/YiJi-admin/src/views/Info/EntrustList.vue
index d857820..29bdc34 100644
--- a/YiJi-admin/src/views/Info/EntrustList.vue
+++ b/YiJi-admin/src/views/Info/EntrustList.vue
@@ -36,7 +36,7 @@
 					</el-select>
 				</el-form-item>
 				<el-form-item>
-					<el-select multiple :filterable="true" clearable v-model="searchInfo.resources" placeholder="资源"
+					<el-select multiple :filterable="true" clearable v-model="searchInfo.resources" placeholder="排班资源"
 						style="margin-left: 8px;width: 250px;">
 						<el-option v-for="(item,index) in enableResourceList" :key="index"
 							:label="item.department_resources_name" :value="item.id" />
diff --git a/YiJi-admin/src/views/YeWu/MainList.vue b/YiJi-admin/src/views/YeWu/MainList.vue
index 54f2c87..43c7899 100644
--- a/YiJi-admin/src/views/YeWu/MainList.vue
+++ b/YiJi-admin/src/views/YeWu/MainList.vue
@@ -43,7 +43,7 @@
 						</el-select>
 					</el-form-item>
 					<el-form-item v-if="loginUserinfo && loginUserinfo.group!=2">
-						<el-select multiple :filterable="true" clearable v-model="searchInfo.resources" placeholder="资源"
+						<el-select multiple :filterable="true" clearable v-model="searchInfo.resources" placeholder="排班资源"
 							style="margin-left: 8px;width: 250px;">
 							<el-option v-for="(item,index) in enableResourceList" :key="index"
 								:label="item.department_resources_name" :value="item.id" />
diff --git a/YiJi-admin/src/views/YeWu/MainListWithDept.vue b/YiJi-admin/src/views/YeWu/MainListWithDept.vue
index f66dee3..929c4a9 100644
--- a/YiJi-admin/src/views/YeWu/MainListWithDept.vue
+++ b/YiJi-admin/src/views/YeWu/MainListWithDept.vue
@@ -50,7 +50,7 @@
 					</el-select>
 				</el-form-item>
 				<el-form-item>
-					<el-select multiple :filterable="true" clearable v-model="searchInfo.resources" placeholder="资源"
+					<el-select multiple :filterable="true" clearable v-model="searchInfo.resources" placeholder="排班资源"
 						style="margin-left: 8px;width: 250px;">
 						<el-option v-for="(item,index) in enableResourceList" :key="index"
 							:label="item.department_resources_name" :value="item.id" />