Merge branch 'dev'

This commit is contained in:
wenjianzhang committed 2021-06-15 12:28:02 +08:00
1 parent 9fb23b45cd
commit 2d4b4d617d
1 file changed
+3 -8
+3 -8
View File
@@ -10,7 +10,6 @@ import (
"go-admin/app/other/service/dto"
"go-admin/common/actions"
cDto "go-admin/common/dto"
common "go-admin/common/models"
)
type SysChinaAreaData struct {
@@ -97,9 +96,8 @@ func (e *SysChinaAreaData) Insert(model *models.SysChinaAreaData) error {
// Update 修改SysChinaAreaData对象
func (e *SysChinaAreaData) Update(c *models.SysChinaAreaData, p *actions.DataPermission) error {
db := e.Orm.Model(&models.SysChinaAreaData{
Model: common.Model{
Id: c.GetId().(int),
}}).
Id: c.GetId().(int),
}).
Scopes(
actions.Permission(c.TableName(), p),
).Updates(c)
@@ -115,14 +113,11 @@ func (e *SysChinaAreaData) Update(c *models.SysChinaAreaData, p *actions.DataPer
// Remove 删除SysChinaAreaData
func (e *SysChinaAreaData) Remove(d *dto.SysChinaAreaDataById, p *actions.DataPermission) error {
var data models.SysChinaAreaData
db := e.Orm.Model(&data).
Scopes(
actions.Permission(data.TableName(), p),
).Delete(&data, d.GetId())
if err := db.Error; err != nil {
e.Log.Errorf("Service RemoveSysChinaAreaData error: %s", err)
return err
@@ -131,4 +126,4 @@ func (e *SysChinaAreaData) Remove(d *dto.SysChinaAreaDataById, p *actions.DataPe
return errors.New("无权删除该数据")
}
return nil
}
}