feat(账号到期): 普通账号不再带自己的到期时间,入口与接口一起收窄
口径(2026-10-05 用户定):到期时间只需要设在管理员/公司超管身上,普通账号的停用 由上级级联决定(组长 + 创建人 + 本公司公司超管,见 AccountExpiryService)。 此前这条只存在于约定里,任何调用方都能给普通账号写 expires_at。 - 后端 AdminUserService:建号/编辑两道 400(绕过界面直接打接口传值就拒), 把管理员改成普通账号时同批把 expires_at 置 null;判据 mayCarryOwnExpiry = admin|company_super_admin。 - 前端:user-create-model 导出同名判据(一支跨端用例逐字钉两端集合相等), toCreateUserRequest 对 normal 不下发;toEditUserUpdateRequest 按"改完之后 的角色"决定,不能带就发空串=清空,公司超管目标因请求不带 role 而保留原值; 两个对话框的「到期时间」项加 v-if="expiryEditable"。 - 用例:后端新增 4 支(含一条「普通账号仍可传空串清除」控制组,14 例绿); 前端新增 9 支;旧 company-user-create 那条编码旧口径的断言改 role=admin。
This commit is contained in:
@@ -3,6 +3,7 @@ import { computed, reactive, ref, watch } from 'vue'
|
||||
import { submitCreateUser } from './user-create-adapter'
|
||||
import {
|
||||
createEmptyCreateUserForm,
|
||||
mayCarryOwnExpiry,
|
||||
type CreateUserForm,
|
||||
type CreateUserFormErrors,
|
||||
validateCreateUserForm,
|
||||
@@ -38,6 +39,8 @@ const canChooseRole = computed(() => props.operatorSuper || props.operatorRole =
|
||||
const roleChoices = computed(() =>
|
||||
props.operatorSuper ? ROLE_CHOICES : ROLE_CHOICES.filter((opt) => opt.value !== 'company_super_admin'),
|
||||
)
|
||||
/** 只有管理员/公司超管有「自己的到期时间」;普通账号跟随上级级联,不给它入口。 */
|
||||
const expiryEditable = computed(() => mayCarryOwnExpiry(form.role))
|
||||
|
||||
watch(
|
||||
() => props.modelValue,
|
||||
@@ -140,7 +143,7 @@ async function create(): Promise<void> {
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="到期时间(留空 = 永不过期;到期后该账号及其名下账号将停用)">
|
||||
<el-form-item v-if="expiryEditable" label="到期时间(留空 = 永不过期;到期后该账号及其名下账号将停用)">
|
||||
<el-date-picker
|
||||
v-model="form.expiresAt"
|
||||
type="datetime"
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
<script setup lang="ts">
|
||||
import { computed, reactive, ref, watch } from 'vue'
|
||||
import type { AdminUser } from '@/types/admin'
|
||||
import { mayCarryOwnExpiry } from './user-create-model'
|
||||
import { fillEditUserForm, validateEditUserForm, type EditUserForm, type EditUserFormErrors } from './user-edit-model'
|
||||
import { submitEditUser } from './user-edit-adapter'
|
||||
import { loadUserMenuAuth } from './user-menu-auth-api'
|
||||
@@ -19,6 +20,11 @@ const loadingAuth = ref(false)
|
||||
const authReady = ref(false)
|
||||
/** 公司超管目标:角色单选隐藏(请求体也不带 role),只允许改密码/到期时间/菜单。 */
|
||||
const targetIsCompanySuperAdmin = computed(() => (props.user?.role || '').trim().toLowerCase() === 'company_super_admin')
|
||||
/** 公司超管目标的角色单选是隐藏的(改完仍是 company_super_admin),到期时间照旧可改;
|
||||
* 管理员改成普通账号时这一项消失,保存按「清空」下发(见 user-edit-model 的 roleAfter)。 */
|
||||
const expiryEditable = computed(() =>
|
||||
mayCarryOwnExpiry(targetIsCompanySuperAdmin.value ? 'company_super_admin' : form.role),
|
||||
)
|
||||
|
||||
watch(
|
||||
() => props.modelValue,
|
||||
@@ -112,7 +118,7 @@ async function save(): Promise<void> {
|
||||
<el-form-item v-if="targetIsCompanySuperAdmin" label="角色">
|
||||
<el-input model-value="公司超级管理员" readonly />
|
||||
</el-form-item>
|
||||
<el-form-item label="到期时间(清空 = 永不过期;到期后该账号及其名下账号将停用)">
|
||||
<el-form-item v-if="expiryEditable" label="到期时间(清空 = 永不过期;到期后该账号及其名下账号将停用)">
|
||||
<el-date-picker
|
||||
v-model="form.expiresAt"
|
||||
type="datetime"
|
||||
|
||||
@@ -57,6 +57,17 @@ export function normalizeCreateRole(role: string | null | undefined): CreatableU
|
||||
return 'normal'
|
||||
}
|
||||
|
||||
/**
|
||||
* 可携带「自己的到期时间」的角色,与后端 AdminUserService#mayCarryOwnExpiry 逐字对齐
|
||||
* (normal-account-no-own-expiry.test.ts 钉两端集合相等)。普通账号的停用只由上级
|
||||
* (组长/公司超管)级联决定,给它单独设到期时间既没入口也没语义。
|
||||
*/
|
||||
export const EXPIRY_OWNABLE_ROLES: ReadonlyArray<string> = ['admin', 'company_super_admin']
|
||||
|
||||
export function mayCarryOwnExpiry(role: string | null | undefined): boolean {
|
||||
return EXPIRY_OWNABLE_ROLES.includes((role || '').trim().toLowerCase())
|
||||
}
|
||||
|
||||
/** 表单校验(镜像后端:用户名≥2、密码≥6、均必填;公司超管必须选公司);返回逐字段错误。 */
|
||||
export function validateCreateUserForm(form: CreateUserForm): {
|
||||
valid: boolean
|
||||
@@ -88,6 +99,9 @@ export function validateCreateUserForm(form: CreateUserForm): {
|
||||
* <p>company_id 仅在 role=company_super_admin 且显式选择时下发(见 CreateUserPayload 注释);
|
||||
* 其余角色不带——归属由后端 `AdminUserService#resolveTargetCompanyId` 落操作者自己的公司,
|
||||
* 想给别的公司建普通账号,得用那个公司自己的管理员登录,不是在这里改请求体。</p>
|
||||
*
|
||||
* <p>expiresAt 只对可带到期时间的角色下发:普通账号的停用走上级级联,
|
||||
* 带了会被后端 400 打回(界面已隐藏该输入项,这里是「表单残留值」的兜底)。</p>
|
||||
*/
|
||||
export function toCreateUserRequest(form: CreateUserForm): CreateUserPayload {
|
||||
const role = normalizeCreateRole(form.role)
|
||||
@@ -100,9 +114,10 @@ export function toCreateUserRequest(form: CreateUserForm): CreateUserPayload {
|
||||
if (payload.role === 'normal' && form.createdBy != null) {
|
||||
payload.createdById = form.createdBy
|
||||
}
|
||||
if (form.expiresAt && String(form.expiresAt).trim()) {
|
||||
if (mayCarryOwnExpiry(role) && form.expiresAt && String(form.expiresAt).trim()) {
|
||||
payload.expiresAt = String(form.expiresAt).trim()
|
||||
}
|
||||
|
||||
if (role === 'company_super_admin' && form.companyId != null) {
|
||||
payload.companyId = form.companyId
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/** 编辑用户表单回填模型(任务 47):从用户行回填可编辑表单,镜像 Java AdminUserUpdateRequest。 */
|
||||
import type { AdminUser } from '../../types/admin'
|
||||
import { CREATE_PASSWORD_MIN_LEN } from './user-create-model.ts'
|
||||
import { CREATE_PASSWORD_MIN_LEN, mayCarryOwnExpiry } from './user-create-model.ts'
|
||||
|
||||
/** 编辑可选角色:站点/公司超管不可改,未知归 normal;后端只收 admin|normal。 */
|
||||
export type EditUserRole = 'normal' | 'admin'
|
||||
@@ -90,20 +90,29 @@ export function validateEditUserForm(form: EditUserForm): { valid: boolean; erro
|
||||
return { valid: Object.keys(errors).length === 0, errors }
|
||||
}
|
||||
|
||||
/** 编辑表单 → 更新请求体:站点超管拒绝、空密码不下发、columnIds 拷贝不共享引用。 */
|
||||
/**
|
||||
* 编辑表单 → 更新请求体:站点超管拒绝、空密码不下发、columnIds 拷贝不共享引用。
|
||||
*
|
||||
* <p>expiresAt 按「改完之后的角色」决定:目标角色不能带自己的到期时间时发空串=清空
|
||||
* (后端 400 闸门只拦「有值」,空串走既有的清除分支)。公司超管目标不带 role,
|
||||
* 它的 roleAfter 就是 company_super_admin,续费那条空串不会被误当成清空。</p>
|
||||
*/
|
||||
export function toEditUserUpdateRequest(form: EditUserForm): EditUserUpdateRequest {
|
||||
const originalRole = (form.originalRole || '').trim().toLowerCase()
|
||||
if (originalRole === 'super_admin') {
|
||||
throw new Error('不能修改超级管理员')
|
||||
}
|
||||
const request: EditUserUpdateRequest = {
|
||||
columnIds: Array.isArray(form.columnIds) ? form.columnIds.slice() : [],
|
||||
expiresAt: (form.expiresAt || '').trim(),
|
||||
}
|
||||
// 公司超管目标不带 role:弹窗里的单选是给管理员/普通用户用的,带着它会整树提交把
|
||||
// 公司超管静默降级。站点超管要调角色,请删号重建或走接口。
|
||||
if (originalRole !== 'company_super_admin') {
|
||||
request.role = form.role === 'admin' ? 'admin' : 'normal'
|
||||
const keepsRole = originalRole !== 'company_super_admin'
|
||||
const nextRole: EditUserRole = form.role === 'admin' ? 'admin' : 'normal'
|
||||
const roleAfter = keepsRole ? nextRole : originalRole
|
||||
const request: EditUserUpdateRequest = {
|
||||
columnIds: Array.isArray(form.columnIds) ? form.columnIds.slice() : [],
|
||||
expiresAt: mayCarryOwnExpiry(roleAfter) ? (form.expiresAt || '').trim() : '',
|
||||
}
|
||||
if (keepsRole) {
|
||||
request.role = nextRole
|
||||
}
|
||||
const password = form.password || ''
|
||||
if (password) request.password = password
|
||||
|
||||
@@ -63,9 +63,11 @@ test('请求体:admin/normal 一律不带 companyId;公司超管必须带且
|
||||
'没选公司就不许带(校验层会先拦住,这里兜底不静默)')
|
||||
})
|
||||
|
||||
test('到期时间:空串不下发,有值随请求体走', () => {
|
||||
test('到期时间:空串不下发,管理员有值随请求体走', () => {
|
||||
assert.equal('expiresAt' in toCreateUserRequest(form()), false, '留空 = 永不过期,不下发')
|
||||
assert.equal(toCreateUserRequest(form({ expiresAt: '2026-12-31 23:59:59' })).expiresAt,
|
||||
// 2026-10-05 收窄后到期时间只能设在管理员/公司超管身上(普通账号那条见
|
||||
// normal-account-no-own-expiry.test.ts),所以这条要角色=管理员才成立。
|
||||
assert.equal(toCreateUserRequest(form({ role: 'admin', expiresAt: '2026-12-31 23:59:59' })).expiresAt,
|
||||
'2026-12-31 23:59:59')
|
||||
})
|
||||
|
||||
|
||||
@@ -0,0 +1,128 @@
|
||||
import test from 'node:test'
|
||||
import assert from 'node:assert/strict'
|
||||
import { readSource } from './helpers.ts'
|
||||
import {
|
||||
createEmptyCreateUserForm,
|
||||
EXPIRY_OWNABLE_ROLES,
|
||||
mayCarryOwnExpiry,
|
||||
toCreateUserRequest,
|
||||
} from '../src/pages/account/user-create-model.ts'
|
||||
import {
|
||||
fillEditUserForm,
|
||||
toEditUserUpdateRequest,
|
||||
} from '../src/pages/account/user-edit-model.ts'
|
||||
|
||||
/**
|
||||
* 「普通账号不带自己的到期时间」(2026-10-05 定案)。
|
||||
*
|
||||
* 需求口径:到期时间只需要设在管理员/公司超管身上,普通账号的停用由上级级联决定
|
||||
* (组长 + 创建人 + 本公司公司超管,见 AccountExpiryService.computeEffective)。
|
||||
* 后端已把这条做进出口(AdminUserService 两处 400 闸门 + 降级即清空),本文件钉前端侧:
|
||||
* 1) 建号时角色是 normal,表单里就算残留了到期值也不许下发(下发即被后端 400 打回);
|
||||
* 2) 编辑时把管理员改成普通账号,要顺带把到期时间发成「清空」而不是原值——
|
||||
* 这条是用户明确选定的行为(自动清空),不是顺手抹掉;
|
||||
* 3) 公司超管目标(表单 role 恒归一成 normal)不许被上面两条误清。
|
||||
*/
|
||||
|
||||
function createForm(overrides: Record<string, unknown> = {}) {
|
||||
return {
|
||||
...createEmptyCreateUserForm(),
|
||||
username: 'zhangsan',
|
||||
password: 'secret123',
|
||||
...overrides,
|
||||
}
|
||||
}
|
||||
|
||||
function editForm(overrides: Record<string, unknown> = {}) {
|
||||
return {
|
||||
uid: 9,
|
||||
username: 'team-lead',
|
||||
password: '',
|
||||
role: 'admin',
|
||||
columnIds: [],
|
||||
originalRole: 'admin',
|
||||
expiresAt: '2026-12-31 23:59:00',
|
||||
...overrides,
|
||||
}
|
||||
}
|
||||
|
||||
// ---------- 建号 ----------
|
||||
|
||||
test('create_normal_does_not_send_expiry_even_when_form_still_holds_it', () => {
|
||||
const payload = toCreateUserRequest(createForm({ role: 'normal', expiresAt: '2026-12-31 23:59:00' }))
|
||||
assert.equal(payload.role, 'normal')
|
||||
assert.ok(!('expiresAt' in payload), `普通账号不许带 expiresAt,实际 payload=${JSON.stringify(payload)}`)
|
||||
})
|
||||
|
||||
test('create_admin_still_sends_expiry', () => {
|
||||
const payload = toCreateUserRequest(createForm({ role: 'admin', expiresAt: '2026-12-31 23:59:00' }))
|
||||
assert.equal(payload.expiresAt, '2026-12-31 23:59:00', '管理员必须还能设到期时间')
|
||||
})
|
||||
|
||||
test('create_company_super_admin_still_sends_expiry', () => {
|
||||
const payload = toCreateUserRequest(
|
||||
createForm({ role: 'company_super_admin', expiresAt: '2026-12-31 23:59:00', companyId: 2 }),
|
||||
)
|
||||
assert.equal(payload.expiresAt, '2026-12-31 23:59:00')
|
||||
assert.equal(payload.companyId, 2)
|
||||
})
|
||||
|
||||
// ---------- 编辑 ----------
|
||||
|
||||
test('edit_demoting_admin_to_normal_sends_expiry_clear', () => {
|
||||
const request = toEditUserUpdateRequest(editForm({ role: 'normal' }))
|
||||
assert.equal(request.role, 'normal')
|
||||
assert.equal(request.expiresAt, '', '降级为普通账号要发「清空」,不能把旧到期时间发给后端换 400')
|
||||
})
|
||||
|
||||
test('edit_company_super_admin_target_keeps_its_expiry', () => {
|
||||
// 公司超管目标:表单 role 被 editRoleOf 归一成 normal,但绝不能被当成"降级"误清。
|
||||
const request = toEditUserUpdateRequest(
|
||||
editForm({ originalRole: 'company_super_admin', role: 'normal', expiresAt: '2026-12-31 23:59:00' }),
|
||||
)
|
||||
assert.ok(!('role' in request), '公司超管目标不带 role')
|
||||
assert.equal(request.expiresAt, '2026-12-31 23:59:00', '续费入口就是改这个值,不许被清空逻辑吞掉')
|
||||
})
|
||||
|
||||
test('edit_normal_target_sends_no_expiry_even_if_row_had_one', () => {
|
||||
// 存量兜底:库里若有"普通账号带到期时间"的行,编辑保存时按清空处理(后端同口径)。
|
||||
const request = toEditUserUpdateRequest(
|
||||
editForm({ originalRole: 'normal', role: 'normal', expiresAt: '2026-12-31 23:59:00' }),
|
||||
)
|
||||
assert.equal(request.expiresAt, '')
|
||||
})
|
||||
|
||||
test('edit_fill_from_row_keeps_expiry_for_admin', () => {
|
||||
const form = fillEditUserForm({ id: 9, username: 'lead', role: 'admin', expiresAt: '2026-12-31 23:59' } as never)
|
||||
assert.equal(form.expiresAt, '2026-12-31 23:59:00', '回填补秒位这条不能坏')
|
||||
})
|
||||
|
||||
// ---------- 跨端对齐 ----------
|
||||
|
||||
test('frontend_and_backend_agree_on_which_roles_carry_expiry', () => {
|
||||
assert.deepEqual(
|
||||
['admin', 'company_super_admin', 'normal', 'super_admin', ''].map(mayCarryOwnExpiry),
|
||||
[true, true, false, false, false],
|
||||
)
|
||||
const java = readSource('../backend-java/src/main/java/com/nanri/aiimage/modules/admin/service/AdminUserService.java')
|
||||
const body = java.match(/private static boolean mayCarryOwnExpiry\(String resolvedRole\) \{([\s\S]*?)\n \}/)
|
||||
assert.ok(body, '后端必须仍有 mayCarryOwnExpiry 这个方法(前端对齐的是它,不是别处)')
|
||||
const javaRoles = [...body[1].matchAll(/"([a-z_]+)"\.equals\(resolvedRole\)/g)].map((m) => m[1]).sort()
|
||||
assert.deepEqual(javaRoles, ['admin', 'company_super_admin'], '后端那份判据必须还是这两个角色')
|
||||
assert.deepEqual([...EXPIRY_OWNABLE_ROLES].sort(), javaRoles, '两端可带到期时间的角色集合必须逐字相等')
|
||||
})
|
||||
|
||||
// ---------- 界面出口(源码钉,防"那一行被删")----------
|
||||
|
||||
test('expiry_input_hidden_for_normal_in_both_dialogs', () => {
|
||||
for (const rel of [
|
||||
'src/pages/account/CreateUserDialog.vue',
|
||||
'src/pages/account/EditUserDialog.vue',
|
||||
]) {
|
||||
const source = readSource(rel)
|
||||
const item = source.match(/<el-form-item[^>]*label="到期时间[^"]*"[^>]*>/)
|
||||
assert.ok(item, `${rel} 必须有「到期时间」表单项`)
|
||||
assert.match(item[0], /v-if=/, `${rel} 的到期时间项必须带角色条件,不能对所有角色都渲染`)
|
||||
assert.match(item[0], /mayCarryOwnExpiry|expiryEditable/, `${rel} 的角色条件要用同一个可到期角色判据`)
|
||||
}
|
||||
})
|
||||
+36
@@ -9,6 +9,7 @@ import com.nanri.aiimage.modules.admin.model.vo.AdminBriefVo;
|
||||
import com.nanri.aiimage.modules.admin.model.vo.AdminUserItemVo;
|
||||
import com.nanri.aiimage.modules.admin.model.vo.AdminUserListVo;
|
||||
import com.nanri.aiimage.common.security.AdminAuthSupport;
|
||||
import com.nanri.aiimage.common.security.DeviceSessionPolicy;
|
||||
import com.nanri.aiimage.modules.admin.util.PinyinAbbrUtil;
|
||||
import com.nanri.aiimage.modules.auth.util.WerkzeugPasswordEncoder;
|
||||
import com.nanri.aiimage.common.mapper.AdminUserMapper;
|
||||
@@ -40,6 +41,10 @@ public class AdminUserService {
|
||||
|
||||
private static final DateTimeFormatter CREATED_AT_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
|
||||
|
||||
/** 普通账号不该带自己的到期时间(2026-10-05 定案):它的停用一律由上级账号级联决定。 */
|
||||
private static final String NORMAL_ACCOUNT_EXPIRY_MESSAGE =
|
||||
"普通账号不需要设置到期时间,其停用跟随上级账号(组长/公司超管)级联";
|
||||
|
||||
private final AdminUserMapper adminUserMapper;
|
||||
private final WerkzeugPasswordEncoder passwordEncoder;
|
||||
private final AdminAuthSupport adminAuthSupport;
|
||||
@@ -156,6 +161,9 @@ public class AdminUserService {
|
||||
// 公司超管是「某一家公司的最高账号」,只能由站点超管开设,谁都不能自己造一级
|
||||
throw new BusinessException(403, "只有超级管理员可以创建公司超级管理员");
|
||||
}
|
||||
if (!mayCarryOwnExpiry(wantRole) && hasExpiryValue(request.getExpiresAt())) {
|
||||
throw new BusinessException(400, NORMAL_ACCOUNT_EXPIRY_MESSAGE);
|
||||
}
|
||||
if (username.isEmpty() || password.isEmpty()) {
|
||||
throw new BusinessException("用户名和密码不能为空");
|
||||
}
|
||||
@@ -216,6 +224,16 @@ public class AdminUserService {
|
||||
return wantRole;
|
||||
}
|
||||
|
||||
/** 哪些角色需要自己带 expires_at:管理员与公司超管;normal 与 super_admin 都不带(超管永不适用)。 */
|
||||
private static boolean mayCarryOwnExpiry(String resolvedRole) {
|
||||
return "admin".equals(resolvedRole) || "company_super_admin".equals(resolvedRole);
|
||||
}
|
||||
|
||||
/** 请求里"给了到期时间":非 null 且非空白。空串是清除指令(恢复永不过期),不算给值。 */
|
||||
private static boolean hasExpiryValue(String raw) {
|
||||
return raw != null && !raw.trim().isEmpty();
|
||||
}
|
||||
|
||||
/**
|
||||
* 解析请求里的到期时间:null/空白 = null(永不过期);支持 yyyy-MM-dd、
|
||||
* yyyy-MM-dd HH:mm、yyyy-MM-dd HH:mm:ss 与 ISO(yyyy-MM-ddTHH:mm)。
|
||||
@@ -362,6 +380,15 @@ public class AdminUserService {
|
||||
}
|
||||
}
|
||||
|
||||
// 到期时间只能设在管理员/公司超管身上(普通账号跟随上级级联)。wantRole 为空表示本次不改角色,
|
||||
// 所以判"改完之后"的角色:非空 storedRole 时 resolveRole 不看 is_admin,推断链不会被带偏。
|
||||
String roleAfter = DeviceSessionPolicy.resolveRole(
|
||||
wantRole == null || wantRole.isEmpty() ? target.getRole() : wantRole,
|
||||
target.getIsAdmin(), target.getCreatedById());
|
||||
if (!mayCarryOwnExpiry(roleAfter) && hasExpiryValue(request.getExpiresAt())) {
|
||||
throw new BusinessException(400, NORMAL_ACCOUNT_EXPIRY_MESSAGE);
|
||||
}
|
||||
|
||||
// 移人先于写库:先确认目标公司可用,再确认 created_by_id 不变式没被破坏
|
||||
Long moveCompanyId = resolveCompanyMove(role, target, request.getCompanyId());
|
||||
if (moveCompanyId != null) {
|
||||
@@ -395,6 +422,15 @@ public class AdminUserService {
|
||||
request.getExpiresAt().trim().isEmpty() ? null : parseExpiresAt(request.getExpiresAt()));
|
||||
dirty = true;
|
||||
}
|
||||
String roleBefore = DeviceSessionPolicy.resolveRole(target.getRole(), target.getIsAdmin(),
|
||||
target.getCreatedById());
|
||||
if (request.getExpiresAt() == null && mayCarryOwnExpiry(roleBefore) && !mayCarryOwnExpiry(roleAfter)
|
||||
&& target.getExpiresAt() != null) {
|
||||
// 角色被降级成普通账号:同一次更新里摘掉它自己的到期时间,之后由上级级联决定它何时停。
|
||||
// 只在"真的发生降级"时清,改密码之类的无关编辑不许顺手抹掉历史值。
|
||||
update.set(AdminUserEntity::getExpiresAt, null);
|
||||
dirty = true;
|
||||
}
|
||||
if (dirty) {
|
||||
adminUserMapper.update(null, update);
|
||||
}
|
||||
|
||||
+82
@@ -22,11 +22,13 @@ import org.mockito.ArgumentCaptor;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
import static org.assertj.core.api.Assertions.catchThrowableOfType;
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.assertj.core.api.Assertions.assertThatThrownBy;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.eq;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.never;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
@@ -236,6 +238,86 @@ class AdminUserServiceCompanySuperAdminTest {
|
||||
.hasMessageContaining("只有超级管理员可以删除公司超级管理员");
|
||||
}
|
||||
|
||||
// ---------- 普通账号不带自身到期(2026-10-05 定案:到期只设在管理员/公司超管身上)----------
|
||||
|
||||
@Test
|
||||
void createRejectsExpiryOnNormalAccount() {
|
||||
AdminUserEntity operator = user(1L, "super_admin", 1L, null);
|
||||
AdminUserCreateRequest request = new AdminUserCreateRequest();
|
||||
request.setUsername("staff-1");
|
||||
request.setPassword("secret1");
|
||||
request.setRole("normal");
|
||||
request.setCreatedById(7L);
|
||||
request.setExpiresAt("2026-12-31 23:59");
|
||||
when(authSupport.currentRole(operator)).thenReturn("super_admin");
|
||||
|
||||
BusinessException ex = catchThrowableOfType(() -> service.createUser(operator, request),
|
||||
BusinessException.class);
|
||||
assertThat(ex).isNotNull();
|
||||
assertThat(ex.getCode()).isEqualTo(400);
|
||||
assertThat(ex.getMessage()).contains("普通账号");
|
||||
verify(userMapper, never()).insert(any(AdminUserEntity.class));
|
||||
}
|
||||
|
||||
@Test
|
||||
void updateRejectsExpiryOnNormalTarget() {
|
||||
AdminUserEntity operator = user(1L, "super_admin", 1L, null);
|
||||
AdminUserEntity target = user(9L, "normal", 1L, 7L);
|
||||
when(authSupport.currentRole(operator)).thenReturn("super_admin");
|
||||
when(userMapper.selectById(9L)).thenReturn(target);
|
||||
|
||||
AdminUserUpdateRequest request = new AdminUserUpdateRequest();
|
||||
request.setExpiresAt("2026-12-31 23:59");
|
||||
|
||||
BusinessException ex = catchThrowableOfType(() -> service.updateUser(operator, 9L, request),
|
||||
BusinessException.class);
|
||||
assertThat(ex).isNotNull();
|
||||
assertThat(ex.getCode()).isEqualTo(400);
|
||||
verify(userMapper, never()).update(any(), any());
|
||||
}
|
||||
|
||||
@Test
|
||||
void demotingAdminToNormalClearsOwnExpiry() {
|
||||
AdminUserEntity operator = user(1L, "super_admin", 1L, null);
|
||||
AdminUserEntity target = user(9L, "admin", 1L, 1L);
|
||||
target.setExpiresAt(LocalDateTime.of(2026, 12, 31, 23, 59));
|
||||
when(authSupport.currentRole(operator)).thenReturn("super_admin");
|
||||
when(userMapper.selectById(9L)).thenReturn(target);
|
||||
|
||||
AdminUserUpdateRequest request = new AdminUserUpdateRequest();
|
||||
request.setRole("normal");
|
||||
|
||||
service.updateUser(operator, 9L, request);
|
||||
|
||||
ArgumentCaptor<LambdaUpdateWrapper<AdminUserEntity>> captor =
|
||||
ArgumentCaptor.forClass(LambdaUpdateWrapper.class);
|
||||
verify(userMapper).update(org.mockito.ArgumentMatchers.isNull(), captor.capture());
|
||||
assertThat(captor.getValue().getSqlSet()).contains("expires_at");
|
||||
// 清的是 null,不是把原时间照抄回去
|
||||
assertThat(captor.getValue().getParamNameValuePairs().values())
|
||||
.noneMatch(value -> value instanceof LocalDateTime);
|
||||
}
|
||||
|
||||
/** 控制用例:收掉入口不许顺手把「清空」也禁掉——空串仍要能把历史值摘成永不过期。 */
|
||||
@Test
|
||||
void normalTargetCanStillClearExpiryWithBlankValue() {
|
||||
AdminUserEntity operator = user(1L, "super_admin", 1L, null);
|
||||
AdminUserEntity target = user(9L, "normal", 1L, 7L);
|
||||
target.setExpiresAt(LocalDateTime.of(2026, 12, 31, 23, 59));
|
||||
when(authSupport.currentRole(operator)).thenReturn("super_admin");
|
||||
when(userMapper.selectById(9L)).thenReturn(target);
|
||||
|
||||
AdminUserUpdateRequest request = new AdminUserUpdateRequest();
|
||||
request.setExpiresAt("");
|
||||
|
||||
service.updateUser(operator, 9L, request);
|
||||
|
||||
ArgumentCaptor<LambdaUpdateWrapper<AdminUserEntity>> captor =
|
||||
ArgumentCaptor.forClass(LambdaUpdateWrapper.class);
|
||||
verify(userMapper).update(org.mockito.ArgumentMatchers.isNull(), captor.capture());
|
||||
assertThat(captor.getValue().getSqlSet()).contains("expires_at");
|
||||
}
|
||||
|
||||
// ---------- helpers ----------
|
||||
|
||||
private static AdminUserEntity user(Long id, String role, Long companyId, Long createdById) {
|
||||
|
||||
Reference in New Issue
Block a user