daihengshun/ArmedPolice
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat：完善项目

Browse Source
This commit is contained in:
henry
2021-11-02 17:01:04 +08:00
parent 20d81825e1
commit 0fa2630933
19 changed files with 171 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
app/model/sys_role.go
View File

@ -1,9 +1,7 @@
package model
import (
"TenantServe/app/common/model"
"TenantServe/serve/orm"
"fmt"
"ArmedPolice/app/common/model"
)
type SysRole struct {
@ -24,20 +22,21 @@ type SysRoleUserInfo struct {
// UserRole 用户角色信息
func (m *SysRole) UserRole(uid uint64) ([]*SysRoleUserInfo, error) {
mSysUserRole := NewSysUserRole()
db := orm.GetDB().Table(m.TableName()+" AS r").
Select("r.is, r.name, u_r.id AS user_role_id").
Joins(fmt.Sprintf("LEFT JOIN %s AS u_r ON r.id = u_r.role_id AND u_r.uid = %d AND u_r.is_deleted = %d",
mSysUserRole.TableName(), uid, model.DeleteStatusForNot)).
Where("r.is_deleted = ?", model.DeleteStatusForNot)
out := make([]*SysRoleUserInfo, 0)
if err := db.Order("r.id " + model.OrderModeToDesc).Scan(&out).Error; err != nil {
return nil, err
}
return out, nil
//mSysUserRole := NewSysUserRole()
//
//db := orm.GetDB().Table(m.TableName()+" AS r").
// Select("r.is, r.name, u_r.id AS user_role_id").
// Joins(fmt.Sprintf("LEFT JOIN %s AS u_r ON r.id = u_r.role_id AND u_r.uid = %d AND u_r.is_deleted = %d",
// mSysUserRole.TableName(), uid, model.DeleteStatusForNot)).
// Where("r.is_deleted = ?", model.DeleteStatusForNot)
//
//out := make([]*SysRoleUserInfo, 0)
//
//if err := db.Order("r.id " + model.OrderModeToDesc).Scan(&out).Error; err != nil {
// return nil, err
//}
//return out, nil
return nil, nil
}
func NewSysRole() *SysRole {