From 93790ea13a6a9fc214c628628569e6110d37eb4b Mon Sep 17 00:00:00 2001 From: zhangwenjian Date: Wed, 8 Apr 2020 15:15:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=A0=BC=E5=BC=8F=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/db.sql | 4 ++-- models/datascope.go | 2 +- models/dept.go | 6 +++--- models/role.go | 28 ++++++++++++++-------------- models/rolemenu.go | 14 +++++++------- models/sysuser.go | 6 +++--- 6 files changed, 30 insertions(+), 30 deletions(-) diff --git a/config/db.sql b/config/db.sql index 17d8a98..31cb601 100644 --- a/config/db.sql +++ b/config/db.sql @@ -217,8 +217,8 @@ CREATE TABLE `sys_post` ( ) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `sys_role`; CREATE TABLE `sys_role` ( - `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '角色编码', - `name` varchar(64) DEFAULT NULL COMMENT '角色名称', + `role_id` int(11) NOT NULL AUTO_INCREMENT COMMENT '角色编码', + `role_name` varchar(64) DEFAULT NULL COMMENT '角色名称', `status` varchar(255) DEFAULT NULL COMMENT '状态', `role_key` varchar(255) DEFAULT NULL COMMENT '角色代码', `role_sort` int(255) DEFAULT NULL COMMENT '角色排序', diff --git a/models/datascope.go b/models/datascope.go index 48ad3c9..f984779 100644 --- a/models/datascope.go +++ b/models/datascope.go @@ -27,7 +27,7 @@ func (e *DataPermission) GetDataScope(tbname string, table *gorm.DB) *gorm.DB { table = table.Where(tbname+".create_by in (SELECT user_id from sys_user where dept_id = ? )", user.DeptId) } if role.DataScope == "4" { - table = table.Where(tbname+".create_by in (SELECT user_id from sys_user where dept_id in(select deptId from sys_dept where dept_path like ? ))", "%"+utils.Int64ToString(user.DeptId)+"%") + table = table.Where(tbname+".create_by in (SELECT user_id from sys_user where sys_user.dept_id in(select dept_id from sys_dept where dept_path like ? ))", "%"+utils.Int64ToString(user.DeptId)+"%") } if role.DataScope == "5" || role.DataScope == "" { table = table.Where(tbname+".create_by = ?", e.UserId) diff --git a/models/dept.go b/models/dept.go index e1c95ae..15c46c7 100644 --- a/models/dept.go +++ b/models/dept.go @@ -191,14 +191,14 @@ func Digui(deptlist *[]Dept, menu Dept) Dept { func (e *Dept) Update(id int64) (update Dept, err error) { e.UpdateTime = utils.GetCurrntTime() - if err = orm.Eloquent.Table("sys_dept").Where("deptId = ?", id).First(&update).Error; err != nil { + if err = orm.Eloquent.Table("sys_dept").Where("dept_id = ?", id).First(&update).Error; err != nil { return } deptPath := "/" + utils.Int64ToString(e.Deptid) if int(e.ParentId) != 0 { var deptP Dept - orm.Eloquent.Table("sys_dept").Where("deptId = ?", e.ParentId).First(&deptP) + orm.Eloquent.Table("sys_dept").Where("dept_id = ?", e.ParentId).First(&deptP) deptPath = deptP.DeptPath + deptPath } else { deptPath = "/0" + deptPath @@ -218,7 +218,7 @@ func (e *Dept) Delete(id int64) (success bool, err error) { mp["is_del"] = "1" mp["update_time"] = utils.GetCurrntTime() mp["update_by"] = e.UpdateBy - if err = orm.Eloquent.Table("sys_dept").Where("deptId = ?", id).Update(mp).Error; err != nil { + if err = orm.Eloquent.Table("sys_dept").Where("dept_id = ?", id).Update(mp).Error; err != nil { success = false return } diff --git a/models/role.go b/models/role.go index beed0e9..fa79735 100644 --- a/models/role.go +++ b/models/role.go @@ -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 diff --git a/models/rolemenu.go b/models/rolemenu.go index 45b8172..599ab16 100644 --- a/models/rolemenu.go +++ b/models/rolemenu.go @@ -33,7 +33,7 @@ func (rm *RoleMenu) Get() ([]RoleMenu, error) { func (rm *RoleMenu) GetPermis() ([]string, error) { var r []Menu - table := orm.Eloquent.Select("sys_menu.permission").Table("sys_role_menu").Joins("left join sys_menu on sys_menu.menuId = sys_role_menu.menu_id") + table := orm.Eloquent.Select("sys_menu.permission").Table("sys_role_menu").Joins("left join sys_menu on sys_menu.menu_id = sys_role_menu.menu_id") table = table.Where("role_id = ?", rm.RoleId) @@ -51,9 +51,9 @@ func (rm *RoleMenu) GetPermis() ([]string, error) { func (rm *RoleMenu) GetIDS() ([]MenuPath, error) { var r []MenuPath table := orm.Eloquent.Select("sys_menu.path").Table("sys_role_menu") - table = table.Joins("left join sys_role on sys_role.id=sys_role_menu.role_id") + table = table.Joins("left join sys_role on sys_role.role_id=sys_role_menu.role_id") table = table.Joins("left join sys_menu on sys_menu.id=sys_role_menu.menu_id") - table = table.Where("sys_role.name = ? and sys_menu.type=1", rm.RoleName) + table = table.Where("sys_role.role_name = ? and sys_menu.type=1", rm.RoleName) if err := table.Find(&r).Error; err != nil { return nil, err } @@ -68,7 +68,7 @@ func (rm *RoleMenu) DeleteRoleMenu(roleId int64) (bool, error) { return false, err } var role SysRole - if err := orm.Eloquent.Table("sys_role").Where("id = ?", roleId).First(&role).Error; err != nil { + if err := orm.Eloquent.Table("sys_role").Where("role_id = ?", roleId).First(&role).Error; err != nil { return false, err } sql3 := "delete from casbin_rule where v0= '" + role.RoleKey + "';" @@ -83,7 +83,7 @@ func (rm *RoleMenu) BatchDeleteRoleMenu(roleIds []int64) (bool, error) { return false, err } var role []SysRole - if err := orm.Eloquent.Table("sys_role").Where("id in (?)", roleIds).Find(&role).Error; err != nil { + if err := orm.Eloquent.Table("sys_role").Where("role_id in (?)", roleIds).Find(&role).Error; err != nil { return false, err } sql := "" @@ -97,11 +97,11 @@ func (rm *RoleMenu) BatchDeleteRoleMenu(roleIds []int64) (bool, error) { func (rm *RoleMenu) Insert(roleId int64, menuId []int64) (bool, error) { var role SysRole - if err := orm.Eloquent.Table("sys_role").Where("id = ?", roleId).First(&role).Error; err != nil { + if err := orm.Eloquent.Table("sys_role").Where("role_id = ?", roleId).First(&role).Error; err != nil { return false, err } var menu []Menu - if err := orm.Eloquent.Table("sys_menu").Where("menuId in (?)", menuId).Find(&menu).Error; err != nil { + if err := orm.Eloquent.Table("sys_menu").Where("menu_id in (?)", menuId).Find(&menu).Error; err != nil { return false, err } //ORM不支持批量插入所以需要拼接 sql 串 diff --git a/models/sysuser.go b/models/sysuser.go index c1cd274..46716e2 100644 --- a/models/sysuser.go +++ b/models/sysuser.go @@ -106,8 +106,8 @@ type SysUserView struct { // 获取用户数据 func (e *SysUser) Get() (SysUserView SysUserView, err error) { - table := orm.Eloquent.Table("sys_user").Select([]string{"sys_user.*", "sys_role.name"}) - table = table.Joins("left join sys_role on sys_user.role_id=sys_role.id") + table := orm.Eloquent.Table("sys_user").Select([]string{"sys_user.*", "sys_role.role_name"}) + table = table.Joins("left join sys_role on sys_user.role_id=sys_role.role_id") if e.Id != 0 { table = table.Where("user_id = ?", e.Id) } @@ -149,7 +149,7 @@ func (e *SysUser) GetPage(pageSize int, pageIndex int) ([]SysUserPage, int32, er } if e.DeptId != 0 { - table = table.Where("dept_id in (select dept_id from sys_dept where dept_path like ? )", "%"+utils.Int64ToString(e.DeptId)+"%") + table = table.Where("sys_user.dept_id in (select dept_id from sys_dept where dept_path like ? )", "%"+utils.Int64ToString(e.DeptId)+"%") } // 数据权限控制