public/gin-vue-admin
1
0
Fork 0
mirror of https://github.com/flipped-aurora/gin-vue-admin.git synced 2026-09-21 12:32:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
piexlmax
2022-02-24 12:03:58 +08:00
parent a9f0c41cae 30b16984ed
commit 0082ebfdb1
8 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/service/system/sys_api.go
+1 -1
View File
@@ -115,7 +115,7 @@ func (apiService *ApiService) GetAllApis() (err error, apis []system.SysApi) {
//@param: id float64
//@return: err error, api model.SysApi
func (apiService *ApiService) GetApiById(id float64) (err error, api system.SysApi) {
func (apiService *ApiService) GetApiById(id int) (err error, api system.SysApi) {
err = global.GVA_DB.Where("id = ?", id).First(&api).Error
return
}
server/service/system/sys_base_menu.go
+2 -2
View File
@@ -16,7 +16,7 @@ type BaseMenuService struct{}
//@param: id float64
//@return: err error
func (baseMenuService *BaseMenuService) DeleteBaseMenu(id float64) (err error) {
func (baseMenuService *BaseMenuService) DeleteBaseMenu(id int) (err error) {
err = global.GVA_DB.Preload("MenuBtn").Preload("Parameters").Where("parent_id = ?", id).First(&system.SysBaseMenu{}).Error
if err != nil {
var menu system.SysBaseMenu
@@ -118,7 +118,7 @@ func (baseMenuService *BaseMenuService) UpdateBaseMenu(menu system.SysBaseMenu)
//@param: id float64
//@return: err error, menu model.SysBaseMenu
func (baseMenuService *BaseMenuService) GetBaseMenuById(id float64) (err error, menu system.SysBaseMenu) {
func (baseMenuService *BaseMenuService) GetBaseMenuById(id int) (err error, menu system.SysBaseMenu) {
err = global.GVA_DB.Preload("MenuBtn").Preload("Parameters").Where("id = ?", id).First(&menu).Error
return
}
server/service/system/sys_user.go
+1 -1
View File
@@ -140,7 +140,7 @@ func (userService *UserService) SetUserAuthorities(id uint, authorityIds []strin
//@param: id float64
//@return: err error
func (userService *UserService) DeleteUser(id float64) (err error) {
func (userService *UserService) DeleteUser(id int) (err error) {
var user system.SysUser
err = global.GVA_DB.Where("id = ?", id).Delete(&user).Error
if err != nil {