feat:完善项目

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

View File

@ -1,9 +1,7 @@
package model
import (
"TenantServe/app/common/model"
"TenantServe/serve/orm"
"fmt"
"ArmedPolice/app/common/model"
)
type SysAuth struct {
@ -16,45 +14,28 @@ type SysAuthScene struct {
SceneID uint64 `json:"scene_id"`
}
// TenantAuth 租户权限
func (m *SysAuth) TenantAuth(tenantID uint64) ([]*SysAuthScene, error) {
mSysTenantAuth := NewSysTenantAuth()
out := make([]*SysAuthScene, 0)
db := orm.GetDB().Table(m.TableName()+" AS a").
Select("a.*, r_a.id AS scene_id").
Joins(fmt.Sprintf("LEFT JOIN %s AS t_a ON t_a.auth_id = a.id AND t_a.tenant_id = %d AND t_a.is_deleted = %d",
mSysTenantAuth.TableName(), tenantID, model.DeleteStatusForNot)).
Where("a.is_deleted = ?", model.DeleteStatusForNot)
if err := db.Scan(&out).Error; err != nil {
return nil, err
}
return out, nil
}
// RoleAuth 角色权限
func (m *SysAuth) RoleAuth(tenantID, roleID uint64) ([]*SysAuthScene, error) {
mSysTenantAuth := NewSysTenantAuth()
mSysRoleAuth := NewSysRoleAuth()
out := make([]*SysAuthScene, 0)
db := orm.GetDB().Table(m.TableName()+" AS a").
Select("a.*, r_a.id AS scene_id").
Joins(fmt.Sprintf("LEFT JOIN %s AS t_a ON t_a.auth_id = a.id AND t_a.tenant_id = %d AND t_a.is_deleted = %d",
mSysTenantAuth.TableName(), tenantID, model.DeleteStatusForNot)).
Joins(fmt.Sprintf("LEFT JOIN %s AS r_a ON r_a.auth_id = a.id AND r_a.role_id = %d AND r_a.is_deleted = %d",
mSysRoleAuth.TableName(), roleID, model.DeleteStatusForNot)).
Where("a.is_deleted = ?", model.DeleteStatusForNot).
Where("t_a.id > ?", 0)
if err := db.Scan(&out).Error; err != nil {
return nil, err
}
return out, nil
//mSysTenantAuth := NewSysTenantAuth()
//
//mSysRoleAuth := NewSysRoleAuth()
//
//out := make([]*SysAuthScene, 0)
//
//db := orm.GetDB().Table(m.TableName()+" AS a").
// Select("a.*, r_a.id AS scene_id").
// Joins(fmt.Sprintf("LEFT JOIN %s AS t_a ON t_a.auth_id = a.id AND t_a.tenant_id = %d AND t_a.is_deleted = %d",
// mSysTenantAuth.TableName(), tenantID, model.DeleteStatusForNot)).
// Joins(fmt.Sprintf("LEFT JOIN %s AS r_a ON r_a.auth_id = a.id AND r_a.role_id = %d AND r_a.is_deleted = %d",
// mSysRoleAuth.TableName(), roleID, model.DeleteStatusForNot)).
// Where("a.is_deleted = ?", model.DeleteStatusForNot).
// Where("t_a.id > ?", 0)
//
//if err := db.Scan(&out).Error; err != nil {
// return nil, err
//}
//return out, nil
return nil, nil
}
func NewSysAuth() *SysAuth {