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

feat(base): 重置数据库序列并优化查询语句

Browse Source 
- 在 base 模块初始化时添加重置所有序列的函数
- 修改多个模块中的查询语句，使用 Where(key, value) 替代 Where("key = ?", value)
- 优化部分代码结构，提高可读性和维护性
This commit is contained in:
昔念
2025-07-11 03:36:42 +08:00
parent 123543156b
commit d71b1dd169
13 changed files with 65 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/base/service/base_sys_role.go
View File

@@ -30,7 +30,7 @@ func (s *BaseSysRoleService) ModifyAfter(ctx context.Context, method string, par
// updatePerms(roleId, menuIdList?, departmentIds = [])
func (s *BaseSysRoleService) updatePerms(ctx context.Context, roleId uint, menuIdList, departmentIds []uint) (err error) {
// 更新菜单权限
cool.DBM(model.NewBaseSysRoleMenu()).Where("roleId = ?", roleId).Delete()
cool.DBM(model.NewBaseSysRoleMenu()).Where("roleId", roleId).Delete()
if len(menuIdList) > 0 {
roleMenuList := make([]g.MapStrAny, len(menuIdList))
for i, menuId := range menuIdList {
@@ -42,7 +42,7 @@ func (s *BaseSysRoleService) updatePerms(ctx context.Context, roleId uint, menuI
cool.DBM(model.NewBaseSysRoleMenu()).Data(roleMenuList).Insert()
}
// 更新部门权限
cool.DBM(model.NewBaseSysRoleDepartment()).Where("roleId = ?", roleId).Delete()
cool.DBM(model.NewBaseSysRoleDepartment()).Where("roleId", roleId).Delete()
if len(departmentIds) > 0 {
roleDepartmentList := make([]g.MapStrAny, len(departmentIds))
for i, departmentId := range departmentIds {
@@ -54,7 +54,7 @@ func (s *BaseSysRoleService) updatePerms(ctx context.Context, roleId uint, menuI
cool.DBM(model.NewBaseSysRoleDepartment()).Data(roleDepartmentList).Insert()
}
// 刷新权限
userRoles, err := cool.DBM(model.NewBaseSysUserRole()).Where("roleId = ?", roleId).All()
userRoles, err := cool.DBM(model.NewBaseSysUserRole()).Where("roleId", roleId).All()
if err != nil {
return
}
@@ -84,7 +84,7 @@ func (s *BaseSysRoleService) GetByUser(userId uint) []string {
// BaseSysRoleService Info 方法重构
func (s *BaseSysRoleService) ServiceInfo(ctx context.Context, req *cool.InfoReq) (data interface{}, err error) {
info, err := cool.DBM(s.Model).Where("id = ?", req.Id).One()
info, err := cool.DBM(s.Model).Where("id", req.Id).One()
if err != nil {
return nil, err
}
@@ -96,7 +96,7 @@ func (s *BaseSysRoleService) ServiceInfo(ctx context.Context, req *cool.InfoReq)
return nil, err
}
} else {
menus, err = cool.DBM(model.NewBaseSysRoleMenu()).Where("roleId = ?", req.Id).All()
menus, err = cool.DBM(model.NewBaseSysRoleMenu()).Where("roleId", req.Id).All()
if err != nil {
return nil, err
}
@@ -112,7 +112,7 @@ func (s *BaseSysRoleService) ServiceInfo(ctx context.Context, req *cool.InfoReq)
return nil, err
}
} else {
departments, err = cool.DBM(model.NewBaseSysRoleDepartment()).Where("roleId = ?", req.Id).All()
departments, err = cool.DBM(model.NewBaseSysRoleDepartment()).Where("roleId", req.Id).All()
if err != nil {
return nil, err
}