feat(公司tab): 接线 密钥管理与用量统计——分组∩公司取交集,空集不退化
两页都从 controller 这一个唯一出口算范围:收了 company_id 的 handler 自己调 dataReadScope.readScope(operator, companyId),把算好的 ReadScope 交给 service; service 里 scopedUserIds() 只做 companyScope.userIdsOr(base),不再出现第二个判公司的 if。 readScope 落在 controller 而非计划原文写的 service,是因为 Task 8 补的 G2 尺子 CompanyIdParamGoesThroughReadScopeTest 逐 controller 断言"收参数就得自己调出口并把结果当实参交出去"。 空集一律早退(交给 in(...) 会渲染成 IN () → 500),且两条"筛空"日志按超管/主管分开, 排障时看得出是筛空还是查空;非超管空页仍返回带分组下拉的空页,下拉不缩水。 新增 6 条行为用例(超管 group_id∩公司成员集、交集空早退且不查库、不传公司保持不筛、 主管锁定集只被收窄不放大)。分母 3716 → 3722,Failures/Errors 均 0。 FE 侧两页带 company_id 并把 company-tab-wiring 缺口清单从 6 页收到 4 页。
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
<script setup lang="ts">
|
||||
import { computed, onMounted, ref } from 'vue'
|
||||
import { computed, onMounted, ref, watch } from 'vue'
|
||||
import { ElMessage } from 'element-plus'
|
||||
import OldPagination from '@/components/OldPagination.vue'
|
||||
import { todayDateInput } from '@/utils/datetime'
|
||||
@@ -9,8 +9,10 @@ import {
|
||||
} from '@/api/user-secret-usage'
|
||||
import type { GroupOption } from '@/api/user-secrets'
|
||||
import { useAdminSessionStore } from '@/stores/admin-session'
|
||||
import { useCompanyTabStore } from '@/stores/company-tab'
|
||||
|
||||
const session = useAdminSessionStore()
|
||||
const companyTab = useCompanyTabStore()
|
||||
/** 仅超管需要分组维度:非超管数据由后端裁剪到本人分组,分组筛选/列一律不展示。 */
|
||||
const isSuperAdmin = computed(() => session.isSuperAdmin)
|
||||
|
||||
@@ -43,6 +45,7 @@ async function load() {
|
||||
endDate: endDate.value || undefined,
|
||||
keyword: keyword.value.trim() || undefined,
|
||||
groupId: groupFilter.value || undefined,
|
||||
companyId: companyTab.requestCompanyId,
|
||||
page: page.value,
|
||||
pageSize: pageSize.value,
|
||||
})
|
||||
@@ -62,6 +65,9 @@ async function load() {
|
||||
}
|
||||
}
|
||||
|
||||
// 切公司 = 重新取数。不重取的页 = tab 在那页上是假的(G1 的 pageFiles 断言盯着这条)。
|
||||
watch(() => companyTab.activeId, () => void load())
|
||||
|
||||
function search() {
|
||||
page.value = 1
|
||||
load()
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<script setup lang="ts">
|
||||
import { computed, onMounted, ref } from 'vue'
|
||||
import { computed, onMounted, ref, watch } from 'vue'
|
||||
import { ElMessage } from 'element-plus'
|
||||
import { formatDateTime } from '@/utils/datetime'
|
||||
import OldPagination from '@/components/OldPagination.vue'
|
||||
@@ -14,8 +14,10 @@ import {
|
||||
type GroupOption,
|
||||
} from '@/api/user-secrets'
|
||||
import { useAdminSessionStore } from '@/stores/admin-session'
|
||||
import { useCompanyTabStore } from '@/stores/company-tab'
|
||||
|
||||
const session = useAdminSessionStore()
|
||||
const companyTab = useCompanyTabStore()
|
||||
/** 仅超管需要分组维度:非超管数据由后端裁剪到本人分组,分组筛选/列一律不展示。 */
|
||||
const isSuperAdmin = computed(() => session.isSuperAdmin)
|
||||
|
||||
@@ -114,6 +116,7 @@ async function load() {
|
||||
keyword: keyword.value.trim() || undefined,
|
||||
checkStatus: statusFilter.value || undefined,
|
||||
groupId: groupFilter.value || undefined,
|
||||
companyId: companyTab.requestCompanyId,
|
||||
page: page.value,
|
||||
pageSize: pageSize.value,
|
||||
})
|
||||
@@ -127,6 +130,9 @@ async function load() {
|
||||
}
|
||||
}
|
||||
|
||||
// 切公司 = 重新取数。不重取的页 = tab 在那页上是假的(G1 的 pageFiles 断言盯着这条)。
|
||||
watch(() => companyTab.activeId, () => void load())
|
||||
|
||||
function search() {
|
||||
page.value = 1
|
||||
load()
|
||||
|
||||
Reference in New Issue
Block a user