From 2d4b4d617df2f77d996b9c167019da0d1a65e1e8 Mon Sep 17 00:00:00 2001 From: wenjianzhang Date: Tue, 15 Jun 2021 12:28:02 +0800 Subject: [PATCH] Merge branch 'dev' --- app/other/service/sys_china_area_data.go | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/app/other/service/sys_china_area_data.go b/app/other/service/sys_china_area_data.go index 5c63bad2..8f26fab4 100644 --- a/app/other/service/sys_china_area_data.go +++ b/app/other/service/sys_china_area_data.go @@ -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 -} +} \ No newline at end of file