fix🐛: merge 的遗漏
This commit is contained in:
1 parent
a3507998f7
commit
273f2ba8b0
5 files changed
+10
-8
No files matched your search
@@ -188,7 +188,7 @@ func genTableInit(tx *gorm.DB, tablesList []string, i int, c *gin.Context) (tool
|
||||
var dbTable tools.DBTables
|
||||
var dbColumn tools.DBColumns
|
||||
data.TBName = tablesList[i]
|
||||
data.CreateBy = user.GetUserId(c)
|
||||
data.CreateBy = 0
|
||||
|
||||
dbTable.TableName = data.TBName
|
||||
dbtable, err := dbTable.Get(tx)
|
||||
@@ -211,7 +211,7 @@ func genTableInit(tx *gorm.DB, tablesList []string, i int, c *gin.Context) (tool
|
||||
data.Crud = true
|
||||
|
||||
dbcolumn, err := dbColumn.GetList(tx)
|
||||
data.CreateBy = user.GetUserId(c)
|
||||
data.CreateBy = 0
|
||||
data.TableComment = dbtable.TableComment
|
||||
if dbtable.TableComment == "" {
|
||||
data.TableComment = data.ClassName
|
||||
@@ -311,7 +311,7 @@ func (e SysTable) UpdateSysTable(c *gin.Context) {
|
||||
return
|
||||
}
|
||||
|
||||
data.UpdateBy = user.GetUserId(c)
|
||||
data.UpdateBy = 0
|
||||
result, err := data.Update(db)
|
||||
if err != nil {
|
||||
log.Errorf("Update error, %s", err.Error())
|
||||
|
||||
@@ -147,7 +147,7 @@ func (e SysFileDir) Update(c *gin.Context) {
|
||||
serviceSysFileDir := service.SysFileDir{}
|
||||
serviceSysFileDir.Orm = db
|
||||
serviceSysFileDir.Log = log
|
||||
err = serviceSysFileDir.UpdateSysFileDir(control, p)
|
||||
err = serviceSysFileDir.Update(control, p)
|
||||
if err != nil {
|
||||
log.Errorf("UpdateSysFileDir error, %s", err)
|
||||
e.Error(http.StatusInternalServerError, err, "更新失败")
|
||||
|
||||
@@ -2,6 +2,8 @@ package service
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"go-admin/app/other/models"
|
||||
"go-admin/app/other/service/dto"
|
||||
common "go-admin/common/models"
|
||||
|
||||
"github.com/go-admin-team/go-admin-core/sdk/service"
|
||||
|
||||
@@ -3,7 +3,7 @@ package service
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"go-admin/app/admin/models/system"
|
||||
common "go-admin/common/models"
|
||||
|
||||
"github.com/go-admin-team/go-admin-core/sdk/service"
|
||||
"gorm.io/gorm"
|
||||
@@ -88,11 +88,11 @@ func (e *SysFileDir) InsertSysFileDir(model *dto.SysFileDirControl) error {
|
||||
}
|
||||
|
||||
// UpdateSysFileDir 修改SysFileDir对象
|
||||
func (e *SysFileDir) UpdateSysFileDir(c *dto.SysFileDirControl, p *actions.DataPermission) error {
|
||||
func (e *SysFileDir) Update(c *dto.SysFileDirControl, p *actions.DataPermission) error {
|
||||
var err error
|
||||
data, _ := c.GenerateM()
|
||||
|
||||
db := e.Orm.Model(&system.SysRole{RoleId: c.GetId().(int)}).
|
||||
db := e.Orm.Model(&models.SysFileDir{Model: common.Model{Id: c.GetId().(int)}}).
|
||||
Scopes(
|
||||
actions.Permission(data.TableName(), p),
|
||||
).Updates(data)
|
||||
|
||||
@@ -92,7 +92,7 @@ func (e *SysFileInfo) UpdateSysFileInfo(c *dto.SysFileInfoControl, p *actions.Da
|
||||
return err
|
||||
}
|
||||
err = e.Orm.Debug().Model(&models.SysFileInfo{Model: common.Model{
|
||||
Id: c.ID,
|
||||
Id: c.Id,
|
||||
}}).
|
||||
Scopes(
|
||||
actions.Permission(data.TableName(), p),
|
||||
|
||||
Reference in new issue
Block a user