组织数据读取权限完成

This commit is contained in:
XM-GO
2023-09-15 15:13:39 +08:00
parent b5ee2a54b9
commit 6630ebdb02
37 changed files with 717 additions and 59 deletions

View File

@@ -40,6 +40,7 @@ func (g *GenTableApi) GetTablePage(rc *restfulx.ReqCtx) {
dgt.TableName = restfulx.QueryParam(rc, "tableName")
dgt.TableComment = restfulx.QueryParam(rc, "tableComment")
dgt.RoleId = rc.LoginAccount.RoleId
dgt.Owner = rc.LoginAccount.UserName
list, total := g.GenTableApp.FindListPage(pageNum, pageSize, dgt)
rc.ResData = model.ResultPage{
@@ -78,6 +79,7 @@ func (g *GenTableApi) GetTableInfoByName(rc *restfulx.ReqCtx) {
func (g *GenTableApi) GetTableTree(rc *restfulx.ReqCtx) {
dgt := entity.DevGenTable{}
dgt.RoleId = rc.LoginAccount.RoleId
dgt.Owner = rc.LoginAccount.UserName
rc.ResData = g.GenTableApp.FindTree(dgt)
}
@@ -92,6 +94,7 @@ func (g *GenTableApi) Insert(rc *restfulx.ReqCtx) {
go func(wg *sync.WaitGroup, index int) {
genTable := gen.ToolsGenTableColumn.GenTableInit(tablesList[index])
genTable.OrgId = rc.LoginAccount.OrganizationId
genTable.Owner = rc.LoginAccount.UserName
g.GenTableApp.Insert(genTable)
wg.Done()
}(&wg, index)

View File

@@ -5,6 +5,7 @@ import "github.com/PandaXGO/PandaKit/model"
type DevGenTable struct {
TableId int64 `gorm:"primaryKey;autoIncrement" json:"tableId"` // 编号
OrgId int64 `json:"orgId" gorm:"type:int;comment:机构ID"`
Owner string `json:"owner" gorm:"type:varchar(64);comment:创建者,所有者"`
TableName string `gorm:"table_name" json:"tableName"` // 表名称
TableComment string `gorm:"table_comment" json:"tableComment"` // 表描述
ClassName string `gorm:"class_name" json:"className"` // 实体类名称

View File

@@ -3,6 +3,7 @@ package entity
type DevGenTableColumn struct {
ColumnId int64 `gorm:"primaryKey;autoIncrement" json:"columnId"` // 编号
OrgId int64 `json:"orgId" gorm:"type:int;comment:机构ID"`
Owner string `json:"owner" gorm:"type:varchar(64);comment:创建者,所有者"`
TableId int64 `gorm:"table_id" json:"tableId"` // 归属表编号
TableName string `gorm:"table_name" json:"tableName"`
ColumnName string `gorm:"column_name" json:"columnName"` // 列名称

View File

@@ -97,6 +97,7 @@ func (m *devGenTableModelImpl) Insert(dgt entity.DevGenTable) {
dgt.Columns[i].TableId = dgt.TableId
columns := dgt.Columns[i]
columns.OrgId = dgt.OrgId
columns.Owner = dgt.Owner
DevTableColumnModelDao.Insert(columns)
}
}
@@ -134,7 +135,7 @@ func (m *devGenTableModelImpl) FindTree(data entity.DevGenTable) *[]entity.DevGe
db = db.Where("table_comment = ?", data.TableComment)
}
// 组织数据访问权限
tool.OrgAuthSet(db, data.RoleId)
tool.OrgAuthSet(db, data.RoleId, data.Owner)
err := db.Find(&resData).Error
biz.ErrIsNil(err, "获取TableTree失败")
for i := 0; i < len(resData); i++ {
@@ -161,7 +162,7 @@ func (m *devGenTableModelImpl) FindListPage(page, pageSize int, data entity.DevG
db = db.Where("table_comment = ?", data.TableComment)
}
// 组织数据访问权限
tool.OrgAuthSet(db, data.RoleId)
tool.OrgAuthSet(db, data.RoleId, data.Owner)
db.Where("delete_time IS NULL")
err := db.Count(&total).Error
err = db.Limit(pageSize).Offset(offset).Find(&list).Error