feat: 统一角色枚举 (meetingExecutor/supervisor) + 子账号数据隔离 + Login 读取后端 role_type
后端:
- SysUser 加 roleType 字段 (entity + mapper selectUserVo + service 接口/实现)
- SysUserMapper 新增 selectUserIdsByParent (按 parent_user_id 取子账号列表)
- BizPersonController.list 自动注入 MAIN 业务用户可见性: 仅查 user_id IN (子账号列表)
- BizPersonMapper 加 params.subUserIds foreach 过滤
- BizPerson/BizPersonServiceImpl 配合 getParams().put
前端:
- Login.vue 改用后端 sys_user.roleType 替代 username 前缀 autoRole, 修复 exe01 错入 leader 菜单
- utils/roleMap.js 新增: meetingExecutor->会议执行, supervisor->监察员
- executor/People.vue / sponsor/NewPerson.vue / sponsor/Projects.vue / sponsor/SponsorProjects.vue /
manager/ManagerProjectDetail.vue / manager/{Executor,Sponsor}PersonNew.vue /
admin/{Executor,Sponsor}PersonNew.vue 全部改为 enum key
SQL:
- migration_unify_role_type_2026_08_16.sql 清洗 biz_person.role 从中文到 enum key
This commit is contained in:
@@ -0,0 +1,45 @@
|
||||
-- ============================================================================
|
||||
-- 2026-08-16 重构: 删除 biz_user_role_bind 表, 业务角色统一存 sys_user.role_type
|
||||
--
|
||||
-- 背景:
|
||||
-- 原架构在两个地方存储业务角色 (admin/leader/manager/doctor/executor/sponsor):
|
||||
-- 1. sys_user.role_type 列 (RuoYi 标准列, 只被 updateRoleType 写, 从未读)
|
||||
-- 2. biz_user_role_bind 表 (自建, sys_user 的 1:N 关系设计, 但 replaceUserRoleType 实际是 delete+insert 强制单绑定)
|
||||
-- - 三个注册入口不一致: 专家/admin 创建走 sys_user.role_type, 执行单位走 biz_user_role_bind, 赞助方无实现
|
||||
-- - /admin/users 查询 LEFT JOIN biz_user_role_bind, 因此专家显示空 role_type
|
||||
-- - biz_user_role_bind 的 unit_id/unit_type 列始终为 NULL, 是死代码
|
||||
--
|
||||
-- 重构目标: 统一到 sys_user.role_type, 删 biz_user_role_bind
|
||||
-- 改动:
|
||||
-- 1. sys_user 表确保 role_type 列存在 (RuoYi 标准列, 已存在)
|
||||
-- 2. 从 biz_user_role_bind 同步 role_type 到 sys_user.role_type (兜底已有数据)
|
||||
-- 3. DROP TABLE biz_user_role_bind
|
||||
-- ============================================================================
|
||||
|
||||
-- 1. 确保 sys_user.role_type 列存在 (RuoYi 标准列通常在 ruoyi-mysql.sql 已建, 这里兜底)
|
||||
-- 生产环境如果已存在会报错, 用 IF NOT EXISTS 容错
|
||||
SET @col_exists = (SELECT COUNT(*) FROM information_schema.columns
|
||||
WHERE table_schema = DATABASE() AND table_name = 'sys_user' AND column_name = 'role_type');
|
||||
SET @sql = IF(@col_exists = 0,
|
||||
'ALTER TABLE sys_user ADD COLUMN role_type VARCHAR(20) DEFAULT NULL COMMENT ''业务角色 admin/leader/manager/doctor/executor/sponsor''',
|
||||
'SELECT 1');
|
||||
PREPARE stmt FROM @sql;
|
||||
EXECUTE stmt;
|
||||
DEALLOCATE PREPARE stmt;
|
||||
|
||||
-- 2. 同步 biz_user_role_bind 的 role_type 到 sys_user.role_type
|
||||
-- 一个 user 在 biz_user_role_bind 里最多 1 条 (replaceUserRoleType 强制), 用 MAX(role_type) 兜底
|
||||
UPDATE sys_user u
|
||||
LEFT JOIN (
|
||||
SELECT user_id, MAX(role_type) AS role_type
|
||||
FROM biz_user_role_bind
|
||||
GROUP BY user_id
|
||||
) b ON b.user_id = u.user_id
|
||||
SET u.role_type = b.role_type
|
||||
WHERE u.role_type IS NULL AND b.role_type IS NOT NULL;
|
||||
|
||||
-- 3. DROP biz_user_role_bind
|
||||
DROP TABLE IF EXISTS biz_user_role_bind;
|
||||
|
||||
-- 4. 验证
|
||||
SELECT user_id, user_name, role_type FROM sys_user WHERE role_type IS NOT NULL ORDER BY user_id LIMIT 20;
|
||||
Reference in New Issue
Block a user