diff --git a/backend/src/main/java/com/designhub/service/DepartmentService.java b/backend/src/main/java/com/designhub/service/DepartmentService.java index b7f3019..4540965 100644 --- a/backend/src/main/java/com/designhub/service/DepartmentService.java +++ b/backend/src/main/java/com/designhub/service/DepartmentService.java @@ -472,13 +472,14 @@ public class DepartmentService { } /** - * 获取所有需求部门的ID列表(包括 demand 和 primary_demand 类型) + * 获取所有需求部门的ID列表(只包括 demand 类型,不包括 primary_demand) * 用于跨部门成员分配功能 + * 注意:一级需求部门(primary_demand)的成员不应该出现在下拉列表中 */ public List getAllDemandDeptIds() { List demandDepts = departmentMapper.selectList( new LambdaQueryWrapper() - .in(Department::getDeptType, "demand", "primary_demand") + .eq(Department::getDeptType, "demand") // 只查询 demand 类型,不包括 primary_demand .eq(Department::getStatus, 1) .eq(Department::getDeleted, 0) ); diff --git a/frontend/dist.tar.gz b/frontend/dist.tar.gz index 1e25c2d..128a563 100644 Binary files a/frontend/dist.tar.gz and b/frontend/dist.tar.gz differ diff --git a/frontend/src/views/TaskHall.vue b/frontend/src/views/TaskHall.vue index 5abc4e7..caa79e9 100644 --- a/frontend/src/views/TaskHall.vue +++ b/frontend/src/views/TaskHall.vue @@ -5448,8 +5448,9 @@ const handleApprovePrimaryTask = async (task: Task) => { let crossDeptAssignEnabled = false try { const configResponse = await getSystemConfig('primary_dept_cross_dept_assign') - crossDeptAssignEnabled = configResponse.data?.configValue === 'true' - console.log('跨部门分配功能状态:', crossDeptAssignEnabled) + // API 返回的 data 直接是字符串 "true" 或 "false" + crossDeptAssignEnabled = configResponse.data === 'true' || configResponse.data === true + console.log('跨部门分配功能状态:', crossDeptAssignEnabled, '原始值:', configResponse.data) } catch (e) { console.log('获取跨部门分配配置失败,使用默认值(关闭)') }