admin/guoju0808
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 统一角色枚举 (meetingExecutor/supervisor) + 子账号数据隔离 + Login 读取后端 role_type

Browse Source 
后端:
- 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:
郭庆泰
2026-08-16 13:41:42 +08:00
parent cf5790229a
commit c612d4297a
22 changed files with 1211 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ry-vue3/src/views/manager/ExecutorPersonNew.vue
+173
View File
@@ -0,0 +1,173 @@
<template>
<!--
角色: 🟨 合规 服务机构下人员 新建/编辑 (manager/executor-people/new, manager/executor-people/edit/:id)
结构对齐 admin/ExpertNew.vue
unitType 硬编码 'executor'
角色固定为「会议执行」(执行方子类型, 暂唯一)
-->
<div class="page-card manager-executor-person-new">
<div class="breadcrumb">
<a @click="goBack">服务机构下人员</a> &gt; {{ isEdit ? '编辑人员' : '新建人员' }}{{ orgName ? ' (' + orgName + ')' : '' }}
</div>
<el-card v-loading="loadingDetail" shadow="never" class="form-card nested">
<el-form :model="form" :rules="rules" ref="formRef" label-width="100px">
<el-form-item label="用户名" prop="userName">
<el-input v-model="form.userName" placeholder="登录用户名" maxlength="50" :disabled="isEdit" />
</el-form-item>
<el-form-item label="姓名" prop="name">
<el-input v-model="form.name" placeholder="姓名" maxlength="20" />
</el-form-item>
<el-form-item label="手机号" prop="phone">
<el-input v-model="form.phone" placeholder="手机号" maxlength="11" />
</el-form-item>
<el-form-item label="所属公司" prop="orgName">
<el-input v-model="form.orgName" placeholder="所属公司" maxlength="200" :disabled="!!orgId" />
</el-form-item>
<el-form-item label="部门">
<el-input v-model="form.department" placeholder="部门" maxlength="50" />
</el-form-item>
<el-form-item label="职务">
<el-input v-model="form.position" placeholder="职务" maxlength="50" />
</el-form-item>
<el-form-item label="角色">
<span style="color:#303133">会议执行 <span style="color:#909399;font-size:12px">(执行方人员固定, 暂唯一子类型)</span></span>
</el-form-item>
</el-form>
</el-card>
<div class="form-actions">
<el-button type="primary" :loading="saving" @click="onSave">保存</el-button>
<el-button @click="confirmCancel">取消</el-button>
</div>
</div>
</template>
<script setup>
import { reactive, ref, computed, onMounted } from 'vue'
import { useRoute, useRouter } from 'vue-router'
import { ElMessage, ElMessageBox } from 'element-plus'
import { bizAdd, bizUpdate, bizGet } from '@/api/public'
const router = useRouter()
const route = useRoute()
const formRef = ref(null)
const saving = ref(false)
const loadingDetail = ref(false)
const isEdit = !!route.params.id
const personId = route.params.id || null
const orgName = computed(() => route.query.orgName || '')
const orgId = computed(() => route.query.orgId ? Number(route.query.orgId) : null)
const form = reactive({
personId: null,
userName: '',
name: '',
phone: '',
orgName: '',
department: '',
position: ''
})
const rules = {
userName: [{ required: true, message: '请输入用户名', trigger: 'blur' }],
name: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
phone: [
{ required: true, message: '请输入手机号', trigger: 'blur' },
{ pattern: /^1\d{10}$/, message: '手机号格式错误', trigger: 'blur' }
],
orgName: [{ required: true, message: '请输入所属公司', trigger: 'blur' }]
}
function goBack() {
router.push('/manager/executor-people')
}
async function loadDetail() {
if (!personId) return
loadingDetail.value = true
try {
const res = await bizGet('person', personId)
if (res?.code === 200 && res.data) {
const d = res.data
Object.assign(form, {
personId: d.personId,
userName: d.userName || '',
name: d.name || '',
phone: d.phone || '',
orgName: d.orgName || '',
department: d.department || '',
position: d.position || ''
})
} else {
ElMessage.error(res?.msg || '加载失败')
goBack()
}
} catch (e) {
ElMessage.error(e?.msg || e?.message || '加载失败')
goBack()
} finally {
loadingDetail.value = false
}
}
function confirmCancel() {
const hasContent = form.name || form.phone || form.userName || form.orgName
if (!isEdit && !hasContent) { goBack(); return }
ElMessageBox.confirm('确定取消?未保存的内容将丢失', '提示', { type: 'warning' })
.then(() => goBack())
.catch(() => {})
}
async function onSave() {
try { await formRef.value.validate() } catch { return }
saving.value = true
try {
const payload = { ...form, unitType: 'executor', role: 'meetingExecutor' }
if (!isEdit && orgId.value) payload.orgId = orgId.value
if (isEdit) {
delete payload.personId
await bizUpdate('person', payload)
ElMessage.success('修改成功')
} else {
payload.status = '0'
payload.password = '123456' // @JsonProperty("password") → loginPassword
await bizAdd('person', payload)
ElMessage.success('新建成功,默认密码 123456')
}
goBack()
} catch (e) {
ElMessage.error(e?.msg || e?.message || '保存失败')
} finally {
saving.value = false
}
}
onMounted(() => {
// 预填 orgName (从 org 页面跳来时)
if (!isEdit && orgName.value && !form.orgName) {
form.orgName = orgName.value
}
if (isEdit) loadDetail()
})
</script>
<style scoped>
.manager-executor-person-new { max-width: 1000px; }
.page-card { background: #fff; padding: 16px 20px; border-radius: 6px; border: 1px solid #f0f0f0; }
.breadcrumb { font-size: 13px; color: #8c8c8c; margin-bottom: 16px; }
.breadcrumb a { color: var(--brand-primary); cursor: pointer; text-decoration: none; }
.breadcrumb a:hover { color: var(--brand-primary-deep, var(--brand-primary)); }
.form-card.nested { background: transparent; border: none; box-shadow: none; }
:deep(.form-card .el-card__body) { padding: 24px 28px; }
.form-actions { margin-top: 16px; display: flex; gap: 8px; }
:deep(.el-button--primary) { background: var(--brand-primary); border-color: var(--brand-primary); border-radius: 4px; }
:deep(.el-button--primary:hover) { background: var(--brand-primary-deep, var(--brand-primary)); border-color: var(--brand-primary-deep, var(--brand-primary)); }
:deep(.el-button) { border-radius: 4px; }
:deep(.el-input__wrapper) { border-radius: 4px; }
</style>
ry-vue3/src/views/manager/ManagerProjectDetail.vue
+4 -4
View File
@@ -281,7 +281,7 @@ async function openAddMonitor() {
addMonitorOpen.value = true
if (!monitorCandidates.value.length) {
try {
const resp = await bizList('person', { pageNum: 1, pageSize: 100, role: '监察员', unitType: 'sponsor' })
const resp = await bizList('person', { pageNum: 1, pageSize: 100, role: 'supervisor', unitType: 'sponsor' })
monitorCandidates.value = (resp && resp.rows) || ((resp && resp.data) && (resp && resp.data).rows) || (resp && resp.data) || []
} catch (e) { monitorCandidates.value = [] }
}
@@ -393,7 +393,7 @@ onMounted(async () => {
.section-title {
font-size: 14px; font-weight: 600; color: #262626; margin: 16px 0 12px;
padding-left: 8px; border-left: 3px solid var(--brand-primary, #1890ff);
padding-left: 8px; border-left: 3px solid var(--brand-primary);
}
/* 项目信息: 11 字段, 一列竖排 (el-form + 文本, 无分隔线) */
@@ -407,7 +407,7 @@ onMounted(async () => {
font-family: ui-monospace, "Courier New", monospace;
}
.op-link {
color: var(--brand-primary, #1890ff); text-decoration: none;
color: var(--brand-primary); text-decoration: none;
font-weight: 600; cursor: pointer; font-size: 15px;
}
.op-link:hover { text-decoration: underline; }
@@ -435,5 +435,5 @@ onMounted(async () => {
.toolbar { display: flex; align-items: center; gap: 8px; margin-bottom: 12px; }
/* 评分 */
.score-num { font-size: 18px; color: var(--brand-primary, #1890ff); font-weight: 700; margin-right: 6px; }
.score-num { font-size: 18px; color: var(--brand-primary); font-weight: 700; margin-right: 6px; }
</style>
ry-vue3/src/views/manager/SponsorPersonNew.vue
+172
View File
@@ -0,0 +1,172 @@
<template>
<!--
角色: 🟨 合规 支持单位下人员 新建/编辑 (manager/sponsor-people/new, manager/sponsor-people/edit/:id)
结构对齐 admin/ExpertNew.vue
unitType 硬编码 'sponsor'
-->
<div class="page-card manager-sponsor-person-new">
<div class="breadcrumb">
<a @click="goBack">支持单位下人员</a> &gt; {{ isEdit ? '编辑人员' : '新建人员' }}{{ orgName ? ' (' + orgName + ')' : '' }}
</div>
<el-card v-loading="loadingDetail" shadow="never" class="form-card nested">
<el-form :model="form" :rules="rules" ref="formRef" label-width="100px">
<el-form-item label="用户名" prop="userName">
<el-input v-model="form.userName" placeholder="登录用户名" maxlength="50" :disabled="isEdit" />
</el-form-item>
<el-form-item label="姓名" prop="name">
<el-input v-model="form.name" placeholder="姓名" maxlength="20" />
</el-form-item>
<el-form-item label="手机号" prop="phone">
<el-input v-model="form.phone" placeholder="手机号" maxlength="11" />
</el-form-item>
<el-form-item label="所属公司" prop="orgName">
<el-input v-model="form.orgName" placeholder="所属公司" maxlength="200" :disabled="!!orgId" />
</el-form-item>
<el-form-item label="部门">
<el-input v-model="form.department" placeholder="部门" maxlength="50" />
</el-form-item>
<el-form-item label="职务">
<el-input v-model="form.position" placeholder="职务" maxlength="50" />
</el-form-item>
<el-form-item label="角色">
<span style="color:#303133">监察员 <span style="color:#909399;font-size:12px">(赞助方人员固定)</span></span>
</el-form-item>
</el-form>
</el-card>
<div class="form-actions">
<el-button type="primary" :loading="saving" @click="onSave">保存</el-button>
<el-button @click="confirmCancel">取消</el-button>
</div>
</div>
</template>
<script setup>
import { reactive, ref, computed, onMounted } from 'vue'
import { useRoute, useRouter } from 'vue-router'
import { ElMessage, ElMessageBox } from 'element-plus'
import { bizAdd, bizUpdate, bizGet } from '@/api/public'
const router = useRouter()
const route = useRoute()
const formRef = ref(null)
const saving = ref(false)
const loadingDetail = ref(false)
const isEdit = !!route.params.id
const personId = route.params.id || null
const orgName = computed(() => route.query.orgName || '')
const orgId = computed(() => route.query.orgId ? Number(route.query.orgId) : null)
const form = reactive({
personId: null,
userName: '',
name: '',
phone: '',
orgName: '',
department: '',
position: ''
})
const rules = {
userName: [{ required: true, message: '请输入用户名', trigger: 'blur' }],
name: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
phone: [
{ required: true, message: '请输入手机号', trigger: 'blur' },
{ pattern: /^1\d{10}$/, message: '手机号格式错误', trigger: 'blur' }
],
orgName: [{ required: true, message: '请输入所属公司', trigger: 'blur' }]
}
function goBack() {
router.push('/manager/sponsor-people')
}
async function loadDetail() {
if (!personId) return
loadingDetail.value = true
try {
const res = await bizGet('person', personId)
if (res?.code === 200 && res.data) {
const d = res.data
Object.assign(form, {
personId: d.personId,
userName: d.userName || '',
name: d.name || '',
phone: d.phone || '',
orgName: d.orgName || '',
department: d.department || '',
position: d.position || ''
})
} else {
ElMessage.error(res?.msg || '加载失败')
goBack()
}
} catch (e) {
ElMessage.error(e?.msg || e?.message || '加载失败')
goBack()
} finally {
loadingDetail.value = false
}
}
function confirmCancel() {
const hasContent = form.name || form.phone || form.userName || form.orgName
if (!isEdit && !hasContent) { goBack(); return }
ElMessageBox.confirm('确定取消?未保存的内容将丢失', '提示', { type: 'warning' })
.then(() => goBack())
.catch(() => {})
}
async function onSave() {
try { await formRef.value.validate() } catch { return }
saving.value = true
try {
const payload = { ...form, unitType: 'sponsor', role: 'supervisor' }
if (!isEdit && orgId.value) payload.orgId = orgId.value
if (isEdit) {
delete payload.personId
await bizUpdate('person', payload)
ElMessage.success('修改成功')
} else {
payload.status = '0'
payload.password = '123456' // @JsonProperty("password") → loginPassword
await bizAdd('person', payload)
ElMessage.success('新建成功,默认密码 123456')
}
goBack()
} catch (e) {
ElMessage.error(e?.msg || e?.message || '保存失败')
} finally {
saving.value = false
}
}
onMounted(() => {
// 预填 orgName (从 org 页面跳来时)
if (!isEdit && orgName.value && !form.orgName) {
form.orgName = orgName.value
}
if (isEdit) loadDetail()
})
</script>
<style scoped>
.manager-sponsor-person-new { max-width: 1000px; }
.page-card { background: #fff; padding: 16px 20px; border-radius: 6px; border: 1px solid #f0f0f0; }
.breadcrumb { font-size: 13px; color: #8c8c8c; margin-bottom: 16px; }
.breadcrumb a { color: var(--brand-primary); cursor: pointer; text-decoration: none; }
.breadcrumb a:hover { color: var(--brand-primary-deep, var(--brand-primary)); }
.form-card.nested { background: transparent; border: none; box-shadow: none; }
:deep(.form-card .el-card__body) { padding: 24px 28px; }
.form-actions { margin-top: 16px; display: flex; gap: 8px; }
:deep(.el-button--primary) { background: var(--brand-primary); border-color: var(--brand-primary); border-radius: 4px; }
:deep(.el-button--primary:hover) { background: var(--brand-primary-deep, var(--brand-primary)); border-color: var(--brand-primary-deep, var(--brand-primary)); }
:deep(.el-button) { border-radius: 4px; }
:deep(.el-input__wrapper) { border-radius: 4px; }
</style>