public/go-admin
1
0
Fork 0
mirror of https://github.com/go-admin-team/go-admin.git synced 2026-09-21 02:04:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

字段格式调整更新

Browse Source
This commit is contained in:
zhangwenjian
2020-04-08 15:15:30 +08:00
parent 7ae2630d3d
commit 93790ea13a
6 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
models/role.go
+14 -14
View File
@@ -7,9 +7,9 @@ import (
type SysRole struct {
// 角色编码
Id int64 `json:"roleId" gorm:"column:id;primary_key"`
Id int64 `json:"roleId" gorm:"column:role_id;primary_key"`
// 角色名称
Name string `json:"roleName" gorm:"column:name"`
Name string `json:"roleName" gorm:"column:role_name"`
Status string `json:"status" gorm:"column:status"`
@@ -46,16 +46,16 @@ func (e *SysRole) GetPage(pageSize int, pageIndex int) ([]SysRole, int32, error)
table := orm.Eloquent.Select("*").Table("sys_role")
if e.Id != 0 {
table = table.Where("id = ?", e.Id)
table = table.Where("role_id = ?", e.Id)
}
if e.Name != "" {
table = table.Where("name = ?", e.Name)
table = table.Where("role_name = ?", e.Name)
}
if e.Status != "" {
table = table.Where("status = ?", e.Status)
}
if e.RoleKey != "" {
table = table.Where("roleKey = ?", e.RoleKey)
table = table.Where("role_key = ?", e.RoleKey)
}
// 数据权限控制
@@ -65,7 +65,7 @@ func (e *SysRole) GetPage(pageSize int, pageIndex int) ([]SysRole, int32, error)
var count int32
if err := table.Where("is_del = 0").Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil {
if err := table.Where("is_del = 0").Order("role_sort").Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil {
return nil, 0, err
}
table.Where("is_del = 0").Count(&count)
@@ -75,10 +75,10 @@ func (e *SysRole) GetPage(pageSize int, pageIndex int) ([]SysRole, int32, error)
func (role *SysRole) Get() (SysRole SysRole, err error) {
table := orm.Eloquent.Table("sys_role")
if role.Id != 0 {
table = table.Where("id = ?", role.Id)
table = table.Where("role_id = ?", role.Id)
}
if role.Name != "" {
table = table.Where("name = ?", role.Name)
table = table.Where("role_name = ?", role.Name)
}
if err = table.First(&SysRole).Error; err != nil {
return
@@ -90,12 +90,12 @@ func (role *SysRole) Get() (SysRole SysRole, err error) {
func (role *SysRole) GetList() (SysRole []SysRole, err error) {
table := orm.Eloquent.Table("sys_role").Where("is_del = 0")
if role.Id != 0 {
table = table.Where("id = ?", role.Id)
table = table.Where("role_id = ?", role.Id)
}
if role.Name != "" {
table = table.Where("name = ?", role.Name)
table = table.Where("role_name = ?", role.Name)
}
if err = table.Find(&SysRole).Error; err != nil {
if err = table.Order("role_sort").Find(&SysRole).Error; err != nil {
return
}
@@ -105,7 +105,7 @@ func (role *SysRole) GetList() (SysRole []SysRole, err error) {
func (role *SysRole) GetRoleMeunId() ([]int64, error) {
menuIds := make([]int64, 0)
menuList := make([]MenuIdList, 0)
if err := orm.Eloquent.Table("sys_role_menu").Select("menu_id").Joins("LEFT JOIN sys_menu on sys_menu.menuId=sys_role_menu.menu_id").Where("role_id = ? ", role.Id).Where(" menu_id not in(select sys_menu.parentId from sys_role_menu LEFT JOIN sys_menu on sys_menu.menuId=sys_role_menu.menu_id where role_id =? )", role.Id).Find(&menuList).Error; err != nil {
if err := orm.Eloquent.Table("sys_role_menu").Select("sys_role_menu.menu_id").Joins("LEFT JOIN sys_menu on sys_menu.menu_id=sys_role_menu.menu_id").Where("role_id = ? ", role.Id).Where(" sys_role_menu.menu_id not in(select sys_menu.parent_id from sys_role_menu LEFT JOIN sys_menu on sys_menu.menu_id=sys_role_menu.menu_id where role_id =? )", role.Id).Find(&menuList).Error; err != nil {
return nil, err
}
@@ -136,7 +136,7 @@ type DeptIdList struct {
func (role *SysRole) GetRoleDeptId() ([]int64, error) {
deptIds := make([]int64, 0)
deptList := make([]DeptIdList, 0)
if err := orm.Eloquent.Table("sys_role_dept").Select("dept_id").Joins("LEFT JOIN sys_dept on sys_dept.deptId=sys_role_dept.dept_id").Where("role_id = ? ", role.Id).Where(" deptId not in(select sys_dept.parent_id from sys_role_dept LEFT JOIN sys_dept on sys_dept.deptId=sys_role_dept.dept_id where role_id =? )", role.Id).Find(&deptList).Error; err != nil {
if err := orm.Eloquent.Table("sys_role_dept").Select("sys_role_dept.dept_id").Joins("LEFT JOIN sys_dept on sys_dept.dept_id=sys_role_dept.dept_id").Where("role_id = ? ", role.Id).Where(" sys_role_dept.dept_id not in(select sys_dept.parent_id from sys_role_dept LEFT JOIN sys_dept on sys_dept.dept_id=sys_role_dept.dept_id where role_id =? )", role.Id).Order("role_sort").Find(&deptList).Error; err != nil {
return nil, err
}
@@ -168,7 +168,7 @@ func (e *SysRole) BatchDelete(id []int64) (Result bool, err error) {
mp["is_del"] = "1"
mp["update_time"] = utils.GetCurrntTime()
mp["update_by"] = e.UpdateBy
if err = orm.Eloquent.Table("sys_role").Where("is_del=0 and id in (?)", id).Update(mp).Error; err != nil {
if err = orm.Eloquent.Table("sys_role").Where("is_del=0 and role_id in (?)", id).Update(mp).Error; err != nil {
return
}
Result = true