fix(admin): 修复新增管理员无角色后不可见

This commit is contained in:
yml
2026-11-17 18:02:22 +08:00
parent ab68cce595
commit 8620d0a733
7 changed files with 175 additions and 18 deletions
+4 -3
View File
@@ -25,9 +25,10 @@ type PaginatedResult struct {
} }
type CreateAdminRequest struct { type CreateAdminRequest struct {
Username string `json:"username" binding:"required"` Username string `json:"username" binding:"required"`
Password string `json:"password" binding:"required"` Password string `json:"password" binding:"required"`
Nickname string `json:"nickname"` Nickname string `json:"nickname"`
RoleIDs []uint64 `json:"role_ids"`
} }
type UpdateAdminRequest struct { type UpdateAdminRequest struct {
@@ -175,6 +175,14 @@ func writeError(c *gin.Context, err error) {
response.BadRequest(c, "原密码错误") response.BadRequest(c, "原密码错误")
case errors.Is(err, ErrWeakPassword): case errors.Is(err, ErrWeakPassword):
response.BadRequest(c, "密码至少 8 位且需包含字母和数字") response.BadRequest(c, "密码至少 8 位且需包含字母和数字")
case errors.Is(err, ErrUsernameRequired):
response.BadRequest(c, "用户名不能为空")
case errors.Is(err, ErrRolesRequired):
response.BadRequest(c, "请至少选择一个角色")
case errors.Is(err, ErrRoleOutsideTenant):
response.BadRequest(c, "角色不属于当前站点")
case errors.Is(err, ErrUsernameExists):
response.Error(c, http.StatusConflict, "username_exists", "用户名已存在,请更换用户名")
case IsNotFound(err): case IsNotFound(err):
response.Error(c, http.StatusNotFound, "not_found", "管理员不存在") response.Error(c, http.StatusNotFound, "not_found", "管理员不存在")
default: default:
+55 -11
View File
@@ -4,6 +4,7 @@ import (
"context" "context"
"errors" "errors"
"fmt" "fmt"
"strings"
"hfb_sys/backend/internal/auditlog" "hfb_sys/backend/internal/auditlog"
"hfb_sys/backend/internal/logging" "hfb_sys/backend/internal/logging"
@@ -74,6 +75,28 @@ func (r *Repository) FindByID(ctx context.Context, id uint64) (*AdminUserDTO, er
} }
func (r *Repository) Create(ctx context.Context, req CreateAdminRequest) (*AdminUserDTO, error) { func (r *Repository) Create(ctx context.Context, req CreateAdminRequest) (*AdminUserDTO, error) {
req.Username = strings.TrimSpace(req.Username)
tenantID := tenancy.IDFromContext(ctx)
roleIDs, err := r.validateTenantRoleIDs(ctx, req.RoleIDs)
if err != nil {
return nil, err
}
if len(roleIDs) == 0 {
return nil, ErrRolesRequired
}
if req.Username == "" {
return nil, ErrUsernameRequired
}
var existing int64
if err := r.db.WithContext(ctx).Model(&model.AdminUser{}).
Where("username = ?", req.Username).
Count(&existing).Error; err != nil {
return nil, err
}
if existing > 0 {
return nil, ErrUsernameExists
}
hash, err := bcrypt.GenerateFromPassword([]byte(req.Password), bcrypt.DefaultCost) hash, err := bcrypt.GenerateFromPassword([]byte(req.Password), bcrypt.DefaultCost)
if err != nil { if err != nil {
return nil, err return nil, err
@@ -87,19 +110,29 @@ func (r *Repository) Create(ctx context.Context, req CreateAdminRequest) (*Admin
TokenVersion: 1, TokenVersion: 1,
PasswordMustChange: false, PasswordMustChange: false,
} }
if err := r.db.WithContext(ctx).Create(&admin).Error; err != nil { err = r.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
if err := tx.Create(&admin).Error; err != nil {
if isDuplicateAdminUsername(err) {
return ErrUsernameExists
}
return err
}
for _, roleID := range roleIDs {
assignment := model.AdminUserRole{
AdminID: admin.ID,
RoleID: roleID,
TenantID: tenantID,
}
if err := tx.Create(&assignment).Error; err != nil {
return err
}
}
return nil
})
if err != nil {
return nil, err return nil, err
} }
return &AdminUserDTO{ return r.FindByID(ctx, admin.ID)
ID: admin.ID,
Username: admin.Username,
Nickname: admin.Nickname,
Status: admin.Status,
Roles: []adminrole.RoleDTO{},
LastLoginAt: admin.LastLoginAt,
CreatedAt: admin.CreatedAt,
UpdatedAt: admin.UpdatedAt,
}, nil
} }
func (r *Repository) Update(ctx context.Context, id uint64, req UpdateAdminRequest) (*AdminUserDTO, error) { func (r *Repository) Update(ctx context.Context, id uint64, req UpdateAdminRequest) (*AdminUserDTO, error) {
@@ -427,6 +460,17 @@ var (
ErrRoleOutsideTenant = errors.New("role is not available in current tenant") ErrRoleOutsideTenant = errors.New("role is not available in current tenant")
) )
func isDuplicateAdminUsername(err error) bool {
if err == nil {
return false
}
if errors.Is(err, gorm.ErrDuplicatedKey) {
return true
}
text := strings.ToLower(err.Error())
return strings.Contains(text, "1062") && strings.Contains(text, "uk_admin_users_username")
}
func IsNotFound(err error) bool { func IsNotFound(err error) bool {
return errors.Is(err, gorm.ErrRecordNotFound) return errors.Is(err, gorm.ErrRecordNotFound)
} }
@@ -9,6 +9,9 @@ import (
var ( var (
ErrDependencyUnavailable = errors.New("dependency unavailable") ErrDependencyUnavailable = errors.New("dependency unavailable")
ErrWeakPassword = errors.New("weak password") ErrWeakPassword = errors.New("weak password")
ErrUsernameRequired = errors.New("username is required")
ErrUsernameExists = errors.New("username already exists")
ErrRolesRequired = errors.New("at least one role is required")
) )
type Service struct { type Service struct {
@@ -72,3 +72,62 @@ func TestAdminListIsScopedByTenantAndKeepsPlatformSuperAdmin(t *testing.T) {
t.Fatalf("assign platform super role in tenant error = %v", err) t.Fatalf("assign platform super role in tenant error = %v", err)
} }
} }
func TestCreateAdminWithTenantRoleRemainsVisible(t *testing.T) {
db := database.NewTestDB()
role := model.Role{Code: "cs", Name: "客服"}
if err := db.Create(&role).Error; err != nil {
t.Fatal(err)
}
repo := NewRepository(db, nil)
created, err := repo.Create(adminMgrTenantContext(202), CreateAdminRequest{
Username: "jieyou-cs",
Password: "password123",
Nickname: "解忧客服",
RoleIDs: []uint64{role.ID},
})
if err != nil {
t.Fatalf("create tenant admin: %v", err)
}
if len(created.Roles) != 1 || created.Roles[0].Code != "cs" {
t.Fatalf("created admin roles = %+v", created.Roles)
}
result, err := repo.List(adminMgrTenantContext(202), 1, 20)
if err != nil {
t.Fatal(err)
}
if result.Total != 1 || result.Items[0].ID != created.ID {
t.Fatalf("tenant admin list = %+v", result)
}
}
func TestCreateAdminRequiresTenantRoleAndRejectsDuplicateUsername(t *testing.T) {
db := database.NewTestDB()
role := model.Role{Code: "cs", Name: "客服"}
if err := db.Create(&role).Error; err != nil {
t.Fatal(err)
}
repo := NewRepository(db, nil)
ctx := adminMgrTenantContext(202)
if _, err := repo.Create(ctx, CreateAdminRequest{
Username: "jieyou-cs",
Password: "password123",
}); !errors.Is(err, ErrRolesRequired) {
t.Fatalf("create without roles error = %v", err)
}
req := CreateAdminRequest{
Username: "jieyou-cs",
Password: "password123",
RoleIDs: []uint64{role.ID},
}
if _, err := repo.Create(ctx, req); err != nil {
t.Fatalf("first create: %v", err)
}
if _, err := repo.Create(ctx, req); !errors.Is(err, ErrUsernameExists) {
t.Fatalf("duplicate create error = %v", err)
}
}
@@ -24,6 +24,7 @@ export interface CreateAdminRequest {
username: string username: string
password: string password: string
nickname?: string nickname?: string
role_ids: number[]
} }
export interface UpdateAdminRequest { export interface UpdateAdminRequest {
@@ -1,7 +1,7 @@
<script setup lang="ts"> <script setup lang="ts">
import { readError } from '@/shared/utils/error' import { readError } from '@/shared/utils/error'
import { ElMessage } from 'element-plus' import { ElMessage } from 'element-plus'
import { ref, watch } from 'vue' import { computed, ref, watch } from 'vue'
import { import {
createAdminMgrUser, createAdminMgrUser,
@@ -10,6 +10,7 @@ import {
type CreateAdminRequest, type CreateAdminRequest,
type UpdateAdminRequest, type UpdateAdminRequest,
} from '@/features/admin/api/adminMgr' } from '@/features/admin/api/adminMgr'
import { fetchRoles, type Role } from '@/features/admin/api/adminRoles'
const props = defineProps<{ const props = defineProps<{
modelValue: boolean modelValue: boolean
@@ -22,18 +23,22 @@ const emit = defineEmits<{
}>() }>()
const submitting = ref(false) const submitting = ref(false)
const rolesLoading = ref(false)
const allRoles = ref<Role[]>([])
const assignableRoles = computed(() => allRoles.value.filter(role => role.code !== 'super_admin'))
const form = ref({ const form = ref({
username: '', username: '',
password: '', password: '',
nickname: '', nickname: '',
status: 'active', status: 'active',
role_ids: [] as number[],
}) })
const isEdit = ref(false) const isEdit = ref(false)
watch( watch(
() => props.modelValue, () => props.modelValue,
val => { async val => {
if (val) { if (val) {
if (props.admin) { if (props.admin) {
isEdit.value = true isEdit.value = true
@@ -42,10 +47,25 @@ watch(
password: '', password: '',
nickname: props.admin.nickname, nickname: props.admin.nickname,
status: props.admin.status, status: props.admin.status,
role_ids: [],
} }
} else { } else {
isEdit.value = false isEdit.value = false
form.value = { username: '', password: '', nickname: '', status: 'active' } form.value = {
username: '',
password: '',
nickname: '',
status: 'active',
role_ids: [],
}
rolesLoading.value = true
try {
allRoles.value = await fetchRoles()
} catch {
ElMessage.error('加载角色列表失败')
} finally {
rolesLoading.value = false
}
} }
} }
}, },
@@ -53,6 +73,10 @@ watch(
) )
async function handleSave() { async function handleSave() {
if (!isEdit.value && form.value.role_ids.length === 0) {
ElMessage.warning('请至少选择一个角色')
return
}
submitting.value = true submitting.value = true
try { try {
if (isEdit.value && props.admin) { if (isEdit.value && props.admin) {
@@ -67,6 +91,7 @@ async function handleSave() {
username: form.value.username, username: form.value.username,
password: form.value.password, password: form.value.password,
nickname: form.value.nickname, nickname: form.value.nickname,
role_ids: form.value.role_ids,
} }
await createAdminMgrUser(req) await createAdminMgrUser(req)
ElMessage.success('管理员已创建') ElMessage.success('管理员已创建')
@@ -97,9 +122,25 @@ async function handleSave() {
v-model="form.password" v-model="form.password"
type="password" type="password"
show-password show-password
placeholder="请输入密码(至少6位)" placeholder="请输入密码(至少8位,包含字母和数字)"
/> />
</el-form-item> </el-form-item>
<el-form-item v-if="!isEdit" label="角色" class="full-control">
<el-select
v-model="form.role_ids"
:loading="rolesLoading"
multiple
placeholder="请选择角色"
style="width: 100%"
>
<el-option
v-for="role in assignableRoles"
:key="role.id"
:label="role.name"
:value="role.id"
/>
</el-select>
</el-form-item>
<el-form-item label="昵称" class="full-control"> <el-form-item label="昵称" class="full-control">
<el-input v-model="form.nickname" placeholder="请输入昵称" /> <el-input v-model="form.nickname" placeholder="请输入昵称" />
</el-form-item> </el-form-item>