主体成员:支持多名管理员 + 成员管理仅管理员可写
后端 - 数据库层面本来就允许多管理员(subject_members 只有 subject_id+user_id 唯一索引,role 无唯一约束), 新增 PUT /api/web/subjects/:id/members/:memberId/role(role=1 管理员 / 2 成员) - 服务层 setMemberRole:创建者不能降级、不能改自己的角色、role 只接受 1/2;返回带 isCreator - 成员管理收口到管理员:addMember / removeMember / createBindCode 由 findForUser 改为 ensureAdmin (此前任何成员都能增删成员,属于越权) - removeMember 增加「管理员需先取消管理员身份再移除」;members() 返回 isCreator 前端 - 成员管理弹窗:「设为管理员 / 取消管理员」按钮,仅管理员可见;创建者行标「创建者」、自己行标「(你自己)」 并隐藏不可操作的按钮;非管理员进入弹窗只看到只读列表 + 提示文案 - subjectApi 增加 updateSubjectMemberRole,SubjectItem.memberId / SubjectMemberItem.isCreator 类型补齐 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
parent
52907b66b7
commit
dc159c6f08
@ -984,8 +984,8 @@ await this.ctx.service.cache.remember('user:1', 60, () => loadFromMysql());
|
||||
|
||||
| 表 | 说明 |
|
||||
|---|---|
|
||||
| `subjects` | 主体:`name`、`admin_user_id`(管理员,默认创建人)、`expire_at`(使用期限)、`status`、`remark` |
|
||||
| `subject_members` | 成员:`subject_id` + `name`(姓名,必填)+ `user_id`(绑定账号,可为空)+ `role`(1 管理员 / 2 成员)+ `wechat_openid` / `bound_at` |
|
||||
| `subjects` | 主体:`name`、`admin_user_id`(**创建者**,恒为管理员)、`expire_at`(使用期限)、`status`、`remark` |
|
||||
| `subject_members` | 成员:`subject_id` + `name`(姓名,必填)+ `user_id`(绑定账号,可为空)+ `role`(1 管理员 / 2 成员,**同一主体可多名管理员**)+ `wechat_openid` / `bound_at` |
|
||||
| 业务表 | `scanners` / `nvrs` / `cameras` / `workstations` / `scan_channels` / `scan_records` 都有 `subject_id` |
|
||||
|
||||
升级时(迁移 `20261018230000-create-subject-tables`)会给**已有数据**的账号各建一个主体(管理员=本人、期限 +365 天),
|
||||
@ -998,13 +998,21 @@ await this.ctx.service.cache.remember('user:1', 60, () => loadFromMysql());
|
||||
| GET | `/api/web/subjects` | 我可进入的主体列表(含角色 / 成员数 / 是否过期 / `trialDays`) |
|
||||
| POST | `/api/web/subjects` | 创建主体 `{ name, remark? }` → 管理员=创建人,**默认赠送 7 天**(`config.subject.trialDays`,env `SUBJECT_TRIAL_DAYS`) |
|
||||
| GET/PUT | `/api/web/subjects/:id` | 详情 / 改名·备注·续期 `{ name?, remark?, extendDays? }`(仅管理员) |
|
||||
| GET | `/api/web/subjects/:id/members` | 成员列表 |
|
||||
| POST | `/api/web/subjects/:id/members` | 按姓名快速添加成员 `{ name }`(此时还没绑账号) |
|
||||
| DELETE | `/api/web/subjects/:id/members/:memberId` | 移除成员(不能删管理员/自己) |
|
||||
| POST | `/api/web/subjects/:id/members/:memberId/bind-code` | 生成成员绑定码(`{ code, bindUrl, qrUrl, expiresIn }`,10 分钟有效) |
|
||||
| GET | `/api/web/subjects/:id/members` | 成员列表(任何成员都能看,只读;带 `isCreator` 标记创建者) |
|
||||
| POST | `/api/web/subjects/:id/members` | 按姓名快速添加成员 `{ name }`(**仅管理员**,此时还没绑账号) |
|
||||
| DELETE | `/api/web/subjects/:id/members/:memberId` | 移除成员(**仅管理员**;不能删创建者/管理员/自己,管理员要先取消管理员) |
|
||||
| PUT | `/api/web/subjects/:id/members/:memberId/role` | 设/取消管理员 `{ role: 1\|2 }`(**仅管理员**;一个主体可多名管理员,创建者恒为管理员不能降级,不能改自己) |
|
||||
| POST | `/api/web/subjects/:id/members/:memberId/bind-code` | 生成成员绑定码(**仅管理员**,`{ code, bindUrl, qrUrl, expiresIn }`,10 分钟有效) |
|
||||
| GET | `/api/subject/member-bind?code=` | 绑定码状态(**公开**,手机扫码页轮询) |
|
||||
| POST | `/api/subject/member-bind/confirm` | 手机端确认绑定 `{ code }`(需 user JWT)→ 该账号成为成员 |
|
||||
|
||||
角色规则(`subject_members.role`):
|
||||
|
||||
- **一个主体可以有多个管理员**(`role=1` 没有唯一约束);`subjects.admin_user_id` 只是**创建者**,同样恒为管理员;
|
||||
- 成员管理(加成员 / 发绑定码 / 设·取消管理员 / 移除)**只有管理员能做**,普通成员只能看成员列表(只读);
|
||||
- 创建者不能降级、不能移除;不能改自己的角色、不能删自己(避免管理员把自己锁死);
|
||||
- 管理员不能直接移除,需先「取消管理员」;给**未绑定账号**的成员设为管理员,绑定后即为管理员。
|
||||
|
||||
### 续期订单与支付回调
|
||||
|
||||
**下单不会立刻续期**,只有支付渠道回调成功后才把主体期限顺延(幂等,重复回调不重复续期)。
|
||||
|
||||
@ -18,6 +18,8 @@ function toId(value) {
|
||||
* - 创建主体:管理员 = 创建人,使用期限默认赠送 7 天(`config.subject.trialDays`)
|
||||
* - 主体列表:只返回「我是成员」的主体(含角色、成员数、是否过期)
|
||||
* - 成员:可按姓名快速创建(尚未绑定账号),再用「绑定码」扫码绑定
|
||||
* - **成员管理(增 / 删 / 发绑定码 / 改角色)只有主体管理员能做**,普通成员只能看列表;
|
||||
* 一个主体可以有多个管理员(`subject_members.role=1`),创建者恒为管理员且不能降级
|
||||
*/
|
||||
class WebSubjectController extends Controller {
|
||||
/** GET /api/web/subjects —— 我可进入的主体列表 */
|
||||
@ -85,7 +87,7 @@ class WebSubjectController extends Controller {
|
||||
ctx.body = { ok: true, data: { subjectId: id, list } };
|
||||
}
|
||||
|
||||
/** POST /api/web/subjects/:id/members —— { name } 按姓名快速添加成员 */
|
||||
/** POST /api/web/subjects/:id/members —— { name } 按姓名快速添加成员(仅管理员) */
|
||||
async addMember() {
|
||||
const { ctx } = this;
|
||||
const id = toId(ctx.params.id);
|
||||
@ -102,6 +104,23 @@ class WebSubjectController extends Controller {
|
||||
ctx.body = { ok: true, data };
|
||||
}
|
||||
|
||||
/** PUT /api/web/subjects/:id/members/:memberId/role —— { role: 1|2 } 设为管理员 / 取消管理员(仅管理员) */
|
||||
async updateMemberRole() {
|
||||
const { ctx } = this;
|
||||
const id = toId(ctx.params.id);
|
||||
const memberId = toId(ctx.params.memberId);
|
||||
if (!id || !memberId) ctx.throw(400, 'id 必须是正整数');
|
||||
|
||||
const { role } = ctx.request.body || {};
|
||||
const data = await ctx.service.subject.setMemberRole({
|
||||
subjectId: id,
|
||||
operatorUserId: ctx.state.user.id,
|
||||
memberId,
|
||||
role,
|
||||
});
|
||||
ctx.body = { ok: true, data };
|
||||
}
|
||||
|
||||
/** DELETE /api/web/subjects/:id/members/:memberId */
|
||||
async removeMember() {
|
||||
const { ctx } = this;
|
||||
|
||||
@ -62,6 +62,8 @@ module.exports = (app) => {
|
||||
router.get('/api/web/subjects/:id/members', apiAuth, controller.web.subject.members);
|
||||
router.post('/api/web/subjects/:id/members', apiAuth, controller.web.subject.addMember);
|
||||
router.delete('/api/web/subjects/:id/members/:memberId', apiAuth, controller.web.subject.removeMember);
|
||||
// 设/取消管理员(一个主体可多名管理员;创建者恒为管理员,不能降级)
|
||||
router.put('/api/web/subjects/:id/members/:memberId/role', apiAuth, controller.web.subject.updateMemberRole);
|
||||
// 给未绑定账号/微信的成员生成绑定码(手机扫码后绑定)
|
||||
router.post('/api/web/subjects/:id/members/:memberId/bind-code', apiAuth, controller.web.subject.memberBindCode);
|
||||
|
||||
|
||||
@ -236,14 +236,19 @@ class SubjectService extends Service {
|
||||
});
|
||||
}
|
||||
|
||||
/** 成员列表(带账号信息) */
|
||||
/**
|
||||
* 成员列表(带账号信息)
|
||||
*
|
||||
* 任何成员都能看(只读);`isCreator` 用来让前端给「主体创建者」隐藏降级/移除按钮。
|
||||
*/
|
||||
async members(subjectId, userId) {
|
||||
await this.findForUser(subjectId, userId);
|
||||
const { subject } = await this.findForUser(subjectId, userId);
|
||||
const rows = await this.Member.findAll({
|
||||
where: { subjectId: Number(subjectId) },
|
||||
order: [[ 'role', 'ASC' ], [ 'id', 'ASC' ]],
|
||||
include: [{ model: this.app.model.User, as: 'user', required: false, attributes: USER_ATTRIBUTES }],
|
||||
});
|
||||
const creatorUserId = Number(subject.adminUserId);
|
||||
return rows.map(row => {
|
||||
const data = row.toJSON();
|
||||
return {
|
||||
@ -256,16 +261,20 @@ class SubjectService extends Service {
|
||||
wechatBound: Boolean(data.wechatOpenid),
|
||||
user: data.user || null,
|
||||
createdAt: data.createdAt,
|
||||
// 主体创建者:恒为管理员,不能降级、不能移除
|
||||
isCreator: Boolean(data.userId) && Number(data.userId) === creatorUserId,
|
||||
};
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 按姓名快速添加成员(先只建成员,账号/微信稍后用绑定码绑定)
|
||||
*
|
||||
* **仅管理员**可操作(普通成员只能看成员列表)。
|
||||
* @param {object} params { subjectId, userId 操作人, name, role? }
|
||||
*/
|
||||
async addMember({ subjectId, userId, name, role } = {}) {
|
||||
await this.findForUser(subjectId, userId);
|
||||
await this.ensureAdmin(subjectId, userId);
|
||||
|
||||
const finalName = String(name || '').trim();
|
||||
if (!finalName) this.ctx.throw(422, '成员姓名不能为空');
|
||||
@ -295,12 +304,65 @@ class SubjectService extends Service {
|
||||
wechatBound: false,
|
||||
user: null,
|
||||
createdAt: created.createdAt,
|
||||
isCreator: false,
|
||||
};
|
||||
}
|
||||
|
||||
/** 删除成员(不能删管理员,也不能删自己) */
|
||||
/**
|
||||
* 设置成员角色(**仅管理员**)
|
||||
*
|
||||
* 一个主体可以有多名管理员(`role=1`),`subjects.admin_user_id` 只是创建者,同样恒为管理员:
|
||||
* - 创建者不能降级(否则「创建者」与 `role` 两套判断会打架);
|
||||
* - 不能改自己的角色(避免管理员把自己降成成员后没人能管);
|
||||
* - 允许给**还没绑定账号**的成员设为管理员:等他用绑定码绑定后直接就是管理员。
|
||||
*
|
||||
* @param {object} params { subjectId, operatorUserId, memberId, role }
|
||||
*/
|
||||
async setMemberRole({ subjectId, operatorUserId, memberId, role } = {}) {
|
||||
const { subject } = await this.ensureAdmin(subjectId, operatorUserId);
|
||||
|
||||
const next = Number(role);
|
||||
if (next !== 1 && next !== 2) this.ctx.throw(422, '角色只能是 1(管理员)或 2(成员)');
|
||||
|
||||
const member = await this.Member.findOne({
|
||||
where: { id: Number(memberId), subjectId: Number(subjectId) },
|
||||
});
|
||||
if (!member) this.ctx.throw(404, '成员不存在');
|
||||
|
||||
if (Number(member.userId) && Number(member.userId) === Number(subject.adminUserId)) {
|
||||
this.ctx.throw(422, '主体创建者始终是管理员,不能降级');
|
||||
}
|
||||
if (Number(member.userId) && Number(member.userId) === Number(operatorUserId)) {
|
||||
this.ctx.throw(422, '不能修改自己的角色,请让其他管理员操作');
|
||||
}
|
||||
|
||||
if (Number(member.role) !== next) {
|
||||
await member.update({ role: next });
|
||||
this.ctx.logger.info('[subject] 用户 %s 把主体 %s 的成员「%s」角色改为 %s',
|
||||
operatorUserId, subjectId, member.name, next === 1 ? '管理员' : '成员');
|
||||
}
|
||||
|
||||
const user = member.userId
|
||||
? await this.app.model.User.findByPk(Number(member.userId), { attributes: USER_ATTRIBUTES })
|
||||
: null;
|
||||
|
||||
return {
|
||||
id: Number(member.id),
|
||||
name: member.name,
|
||||
role: Number(member.role),
|
||||
status: Number(member.status),
|
||||
userId: member.userId ? Number(member.userId) : null,
|
||||
boundAt: member.boundAt,
|
||||
wechatBound: Boolean(member.wechatOpenid),
|
||||
user: user ? user.toJSON() : null,
|
||||
createdAt: member.createdAt,
|
||||
isCreator: Boolean(member.userId) && Number(member.userId) === Number(subject.adminUserId),
|
||||
};
|
||||
}
|
||||
|
||||
/** 删除成员(仅管理员;不能删创建者/管理员,也不能删自己) */
|
||||
async removeMember({ subjectId, operatorUserId, memberId } = {}) {
|
||||
await this.findForUser(subjectId, operatorUserId);
|
||||
await this.ensureAdmin(subjectId, operatorUserId);
|
||||
|
||||
const member = await this.Member.findOne({
|
||||
where: { id: Number(memberId), subjectId: Number(subjectId) },
|
||||
@ -314,6 +376,9 @@ class SubjectService extends Service {
|
||||
if (Number(member.userId) === Number(operatorUserId)) {
|
||||
this.ctx.throw(422, '不能删除自己');
|
||||
}
|
||||
if (Number(member.role) === 1) {
|
||||
this.ctx.throw(422, '该成员是管理员,请先取消管理员身份再移除');
|
||||
}
|
||||
|
||||
await member.destroy();
|
||||
this.ctx.logger.info('[subject] 用户 %s 从主体 %s 移除成员「%s」', operatorUserId, subjectId, member.name);
|
||||
@ -321,13 +386,13 @@ class SubjectService extends Service {
|
||||
}
|
||||
|
||||
/**
|
||||
* 给「未绑定账号/微信」的成员生成绑定码
|
||||
* 给「未绑定账号/微信」的成员生成绑定码(**仅管理员**)
|
||||
*
|
||||
* 手机扫码后打开前端 `/wechat?bind=<码>`,已登录的账号点确认即可完成绑定。
|
||||
* @return {Promise<object>} { code, bindUrl, qrUrl, expiresIn }
|
||||
*/
|
||||
async createBindCode({ subjectId, memberId, operatorUserId } = {}) {
|
||||
const { subject } = await this.findForUser(subjectId, operatorUserId);
|
||||
const { subject } = await this.ensureAdmin(subjectId, operatorUserId);
|
||||
|
||||
const member = await this.Member.findOne({
|
||||
where: { id: Number(memberId), subjectId: Number(subjectId) },
|
||||
|
||||
@ -35,6 +35,15 @@ export function removeSubjectMember(id: number, memberId: number): Promise<{ id:
|
||||
return api.del<{ id: number }>(`/api/web/subjects/${id}/members/${memberId}`);
|
||||
}
|
||||
|
||||
/** 设置成员角色:1 管理员 / 2 成员(仅主体管理员可调用) */
|
||||
export function updateSubjectMemberRole(
|
||||
id: number,
|
||||
memberId: number,
|
||||
role: 1 | 2,
|
||||
): Promise<SubjectMemberItem> {
|
||||
return api.put<SubjectMemberItem>(`/api/web/subjects/${id}/members/${memberId}/role`, { role });
|
||||
}
|
||||
|
||||
export interface MemberBindCode {
|
||||
code: string;
|
||||
memberId: number;
|
||||
|
||||
@ -20,6 +20,8 @@ export interface SubjectItem {
|
||||
/** 1 管理员 2 成员 */
|
||||
role: number;
|
||||
memberName?: string | null;
|
||||
/** 我在该主体里的成员行 id(用来判断列表里哪一行是我自己) */
|
||||
memberId?: number;
|
||||
memberCount?: number;
|
||||
expired: boolean;
|
||||
}
|
||||
@ -34,6 +36,8 @@ export interface SubjectMemberItem {
|
||||
wechatBound: boolean;
|
||||
user?: { id: number; username?: string | null; nickname?: string | null; avatar?: string | null } | null;
|
||||
createdAt?: string;
|
||||
/** 主体创建者:恒为管理员,不能降级/移除 */
|
||||
isCreator?: boolean;
|
||||
}
|
||||
|
||||
function readId(): number | null {
|
||||
|
||||
@ -18,6 +18,7 @@ import {
|
||||
fetchSubjectMembers,
|
||||
removeSubjectMember,
|
||||
updateSubject,
|
||||
updateSubjectMemberRole,
|
||||
type MemberBindCode,
|
||||
} from '@/api/subjectApi';
|
||||
import {
|
||||
@ -181,6 +182,36 @@ async function removeMember(member: SubjectMemberItem) {
|
||||
}
|
||||
}
|
||||
|
||||
/** 设/取消管理员:一个主体可以有多个管理员(创建者恒为管理员,不能降级) */
|
||||
const roleUpdating = ref(0);
|
||||
|
||||
async function toggleRole(member: SubjectMemberItem) {
|
||||
const subject = memberSubject.value;
|
||||
if (!subject) return;
|
||||
|
||||
const nextRole = member.role === 1 ? 2 : 1;
|
||||
const label = nextRole === 1 ? '设为管理员' : '取消管理员';
|
||||
const extra = nextRole === 1
|
||||
? '\n\n设为管理员后,他可以管理成员、续期、改主体信息。'
|
||||
: '\n\n取消后他将只能查看,不能管理成员。';
|
||||
if (!window.confirm(`确认把「${member.name}」${label}?${extra}`)) return;
|
||||
|
||||
roleUpdating.value = member.id;
|
||||
error.value = '';
|
||||
ok.value = '';
|
||||
try {
|
||||
const updated = await updateSubjectMemberRole(subject.id, member.id, nextRole as 1 | 2);
|
||||
members.value = members.value.map(item => (item.id === updated.id ? updated : item));
|
||||
ok.value = `成员「${updated.name}」已${nextRole === 1 ? '设为管理员' : '取消管理员'}`;
|
||||
// 自己在列表里的角色可能影响按钮显隐,顺手刷新主体列表
|
||||
await load();
|
||||
} catch (err) {
|
||||
error.value = err instanceof ApiError ? err.message : `${label}失败`;
|
||||
} finally {
|
||||
roleUpdating.value = 0;
|
||||
}
|
||||
}
|
||||
|
||||
// ---------------- 成员绑定码 ----------------
|
||||
const bindOpen = ref(false);
|
||||
const bindData = ref<MemberBindCode | null>(null);
|
||||
@ -251,6 +282,14 @@ onBeforeUnmount(stopBindPolling);
|
||||
/** 列表里标出「当前主体」 */
|
||||
const currentId = computed(() => currentSubjectId.value);
|
||||
const canRenew = (item: SubjectItem) => Number(item.role) === 1;
|
||||
|
||||
/** 成员管理(增 / 删 / 绑定码 / 改角色)只有主体管理员能做,其他成员只读 */
|
||||
const canManageMembers = computed(() => Number(memberSubject.value?.role || 0) === 1);
|
||||
|
||||
/** 这一行是不是我自己(后端也不允许改自己的角色 / 删自己) */
|
||||
function isSelf(member: SubjectMemberItem) {
|
||||
return Number(memberSubject.value?.memberId || 0) === Number(member.id);
|
||||
}
|
||||
</script>
|
||||
|
||||
<template>
|
||||
@ -348,15 +387,18 @@ const canRenew = (item: SubjectItem) => Number(item.role) === 1;
|
||||
:title="`成员管理 · ${memberSubject?.name || ''}`"
|
||||
@close="memberOpen = false"
|
||||
>
|
||||
<div class="member-add">
|
||||
<div v-if="canManageMembers" class="member-add">
|
||||
<input v-model="newMemberName" placeholder="输入成员姓名,回车快速添加" maxlength="32" @keyup.enter="addMember" />
|
||||
<button class="btn" :disabled="addingMember" @click="addMember">
|
||||
{{ addingMember ? '添加中…' : '添加成员' }}
|
||||
</button>
|
||||
</div>
|
||||
<p class="hint">
|
||||
<p v-if="canManageMembers" class="hint">
|
||||
添加后成员还没有账号:点「绑定码」出二维码,让成员用手机扫码并登录确认,即可绑定到该成员。
|
||||
</p>
|
||||
<p v-else class="hint">
|
||||
你在这个主体里是「成员」,只能查看成员列表;添加成员、发绑定码、设为管理员、移除都需要主体管理员操作。
|
||||
</p>
|
||||
|
||||
<div class="table-wrap member-table">
|
||||
<table class="table table-list">
|
||||
@ -365,12 +407,15 @@ const canRenew = (item: SubjectItem) => Number(item.role) === 1;
|
||||
<th>姓名</th>
|
||||
<th>角色</th>
|
||||
<th>绑定账号</th>
|
||||
<th style="width: 190px">操作</th>
|
||||
<th v-if="canManageMembers" style="width: 280px">操作</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr v-for="member in members" :key="member.id">
|
||||
<td>{{ member.name }}</td>
|
||||
<td>
|
||||
{{ member.name }}
|
||||
<span v-if="member.isCreator" class="badge">创建者</span>
|
||||
</td>
|
||||
<td>
|
||||
<span :class="['badge', member.role === 1 ? 'badge-group' : 'badge-single']">
|
||||
{{ member.role === 1 ? '管理员' : '成员' }}
|
||||
@ -383,19 +428,36 @@ const canRenew = (item: SubjectItem) => Number(item.role) === 1;
|
||||
</template>
|
||||
<span v-else class="muted">未绑定</span>
|
||||
</td>
|
||||
<td class="ops">
|
||||
<td v-if="canManageMembers" class="ops">
|
||||
<button v-if="!member.userId" class="btn btn-sm" @click="openBindCode(member)">绑定码</button>
|
||||
<button
|
||||
v-if="member.role !== 1"
|
||||
class="btn btn-sm btn-ghost"
|
||||
:disabled="roleUpdating === member.id"
|
||||
@click="toggleRole(member)"
|
||||
>
|
||||
设为管理员
|
||||
</button>
|
||||
<button
|
||||
v-else-if="!member.isCreator && !isSelf(member)"
|
||||
class="btn btn-sm btn-ghost"
|
||||
:disabled="roleUpdating === member.id"
|
||||
@click="toggleRole(member)"
|
||||
>
|
||||
取消管理员
|
||||
</button>
|
||||
<button
|
||||
v-if="member.role !== 1 && !member.isCreator && !isSelf(member)"
|
||||
class="btn btn-sm btn-danger"
|
||||
@click="removeMember(member)"
|
||||
>
|
||||
移除
|
||||
</button>
|
||||
<span v-if="isSelf(member)" class="muted">(你自己)</span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr v-if="!members.length && !membersLoading">
|
||||
<td colspan="4" class="empty">还没有成员</td>
|
||||
<td :colspan="canManageMembers ? 4 : 3" class="empty">还没有成员</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user