Skip to content

Commit 974d5b2

Browse files
wenjianzhangwenjianzhang
authored
Merge pull request #438 from go-admin-team/1.3.x
2 parents fda4a94 + fb42953 commit 974d5b2

18 files changed

+59
-58
lines changed

‎app/admin/apis/sys_job/sys_job.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ func (e SysJob) RemoveJobForService(c *gin.Context) {
2424
return
2525
}
2626
var v dto.GeneralDelDto
27-
err = c.Bind(&v)
27+
err = c.BindUri(&v)
2828
if err != nil {
2929
log.Warnf("参数验证错误, error: %s", err)
3030
e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")

‎app/admin/service/sys_china_area_data.go‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package service
22

33
import (
44
"errors"
5+
common "go-admin/common/models"
56

67
"gorm.io/gorm"
78

@@ -71,10 +72,13 @@ func (e *SysChinaAreaData) InsertSysChinaAreaData(model *models.SysChinaAreaData
7172

7273
// UpdateSysChinaAreaData 修改SysChinaAreaData对象
7374
func (e *SysChinaAreaData) UpdateSysChinaAreaData(c *models.SysChinaAreaData, p *actions.DataPermission) error {
74-
db := e.Orm.Model(c).
75+
db := e.Orm.Model(&models.SysChinaAreaData{
76+
Model: common.Model{
77+
Id: c.GetId().(int),
78+
}}).
7579
Scopes(
7680
actions.Permission(c.TableName(), p),
77-
).Where(c.GetId()).Updates(c)
81+
).Updates(c)
7882
if err := db.Error; err != nil {
7983
e.Log.Errorf("Service UpdateSysChinaAreaData error: %s", err)
8084
return err
@@ -103,4 +107,4 @@ func (e *SysChinaAreaData) RemoveSysChinaAreaData(d *dto.SysChinaAreaDataById, p
103107
return errors.New("无权删除该数据")
104108
}
105109
return nil
106-
}
110+
}

‎app/admin/service/sys_config.go‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"go-admin/app/admin/models/system"
66
"go-admin/app/admin/service/dto"
77
cDto "go-admin/common/dto"
8+
common "go-admin/common/models"
89
"go-admin/common/service"
910
"gorm.io/gorm"
1011
)
@@ -84,8 +85,9 @@ func (e *SysConfig) InsertSysConfig(model *system.SysConfig) error {
8485
func (e *SysConfig) UpdateSysConfig(c *system.SysConfig) error {
8586
var err error
8687

87-
db := e.Orm.Model(c).
88-
Where(c.GetId()).Updates(c)
88+
db := e.Orm.Model(&system.SysConfig{Model: common.Model{
89+
Id: c.GetId().(int),
90+
}}).Updates(c)
8991
err = db.Error
9092
if err != nil {
9193
e.Log.Errorf("Service UpdateSysConfig error:%s", err)
@@ -103,8 +105,7 @@ func (e *SysConfig) RemoveSysConfig(d *dto.SysConfigById, c *system.SysConfig) e
103105
var err error
104106
var data system.SysConfig
105107

106-
db := e.Orm.Model(&data).
107-
Where(d.Ids).Delete(c)
108+
db := e.Orm.Model(&data).Delete(c, d.Ids)
108109
if db.Error != nil {
109110
err = db.Error
110111
e.Log.Errorf("Service RemoveSysConfig error:%s", err)
@@ -129,4 +130,4 @@ func (e *SysConfig) GetSysConfigByKEY(c *dto.SysConfigControl) error {
129130
}
130131

131132
return nil
132-
}
133+
}

‎app/admin/service/sys_dept.go‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"errors"
55
log "github.com/go-admin-team/go-admin-core/logger"
66
"github.com/go-admin-team/go-admin-core/sdk/pkg"
7-
87
"gorm.io/gorm"
98

109
"go-admin/app/admin/models/system"
@@ -85,9 +84,9 @@ func (e *SysDept) InsertSysDept(model *system.SysDept) error {
8584
// UpdateSysDept 修改SysDept对象
8685
func (e *SysDept) UpdateSysDept(c *system.SysDept) error {
8786
var err error
88-
var data system.SysDept
89-
90-
db := e.Orm.Model(&data).
87+
db := e.Orm.Model(&system.SysDept{
88+
DeptId: c.GetId().(int),
89+
}).
9190
Where(c.GetId()).Updates(c)
9291
if db.Error != nil {
9392
e.Log.Errorf("db error:%s", err)
@@ -97,9 +96,6 @@ func (e *SysDept) UpdateSysDept(c *system.SysDept) error {
9796
return errors.New("无权更新该数据")
9897
}
9998

100-
//参数1:是要修改的数据
101-
//参数2:是修改的数据
102-
10399
return nil
104100
}
105101

@@ -108,8 +104,7 @@ func (e *SysDept) RemoveSysDept(d *dto.SysDeptById) error {
108104
var err error
109105
var data system.SysDept
110106

111-
db := e.Orm.Model(&data).
112-
Where(d.GetId()).Delete(&data)
107+
db := e.Orm.Model(&data).Delete(&data, d.GetId())
113108
if db.Error != nil {
114109
err = db.Error
115110
e.Log.Errorf("Delete error: %s", err)

‎app/admin/service/sys_dict_data.go‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,9 @@ func (e *SysDictData) Insert(model *system.SysDictData) error {
7171
// Update 修改对象
7272
func (e *SysDictData) Update(c *system.SysDictData) error {
7373
var err error
74-
var data system.SysDictData
75-
76-
db := e.Orm.Model(&data).
77-
Where(c.GetId()).Updates(c)
74+
db := e.Orm.Model(&system.SysDictData{
75+
DictCode: c.GetId().(int),
76+
}).Updates(c)
7877
if db.Error != nil {
7978
e.Log.Errorf("db error: %s", err)
8079
return err
@@ -91,8 +90,7 @@ func (e *SysDictData) Remove(d *dto.SysDictDataById, c *system.SysDictData) erro
9190
var err error
9291
var data system.SysDictData
9392

94-
db := e.Orm.Model(&data).
95-
Where(d.GetId()).Delete(c)
93+
db := e.Orm.Model(&data).Delete(c, d.GetId())
9694
if db.Error != nil {
9795
err = db.Error
9896
e.Log.Errorf("Delete error: %s", err)

‎app/admin/service/sys_dict_type.go‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,9 @@ func (e *SysDictType) Insert(model *system.SysDictType) error {
7171
// Update 修改对象
7272
func (e *SysDictType) Update(c *system.SysDictType) error {
7373
var err error
74-
var data system.SysDictType
75-
76-
db := e.Orm.Model(&data).
77-
Where(c.GetId()).Updates(c)
74+
db := e.Orm.Model(&system.SysDictType{
75+
ID: c.GetId().(int),
76+
}).Updates(c)
7877
if db.Error != nil {
7978
e.Log.Errorf("db error: %s", err)
8079
return err
@@ -91,8 +90,7 @@ func (e *SysDictType) Remove(d *dto.SysDictTypeById, c *system.SysDictType) erro
9190
var err error
9291
var data system.SysDictType
9392

94-
db := e.Orm.Model(&data).
95-
Where(d.GetId()).Delete(c)
93+
db := e.Orm.Model(&data).Delete(c, d.GetId())
9694
if db.Error != nil {
9795
err = db.Error
9896
e.Log.Errorf("Delete error: %s", err)

‎app/admin/service/sys_file_dir.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package service
33
import (
44
"errors"
55
"fmt"
6+
"go-admin/app/admin/models/system"
67

78
"gorm.io/gorm"
89

@@ -91,10 +92,10 @@ func (e *SysFileDir) UpdateSysFileDir(c *dto.SysFileDirControl, p *actions.DataP
9192
var err error
9293
data, _ := c.GenerateM()
9394

94-
db := e.Orm.
95+
db := e.Orm.Model(&system.SysRole{RoleId: c.GetId().(int)}).
9596
Scopes(
9697
actions.Permission(data.TableName(), p),
97-
).Where(c.ID).Updates(data)
98+
).Updates(data)
9899
if db.Error != nil {
99100
e.Log.Errorf("db error: %s", err)
100101
return err
@@ -113,7 +114,7 @@ func (e *SysFileDir) RemoveSysFileDir(d *dto.SysFileDirById, p *actions.DataPerm
113114
db := e.Orm.Model(&data).
114115
Scopes(
115116
actions.Permission(data.TableName(), p),
116-
).Where(d.Id).Delete(&data)
117+
).Delete(&data, d.Id)
117118
if db.Error != nil {
118119
err = db.Error
119120
e.Log.Errorf("Delete error: %s", err)

‎app/admin/service/sys_file_info.go‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package service
22

33
import (
44
"errors"
5+
common "go-admin/common/models"
56

67
"gorm.io/gorm"
78

@@ -89,10 +90,12 @@ func (e *SysFileInfo) UpdateSysFileInfo(c *dto.SysFileInfoControl, p *actions.Da
8990
e.Log.Errorf("db error: %s", err)
9091
return err
9192
}
92-
err = e.Orm.Debug().Model(&data).
93+
err = e.Orm.Debug().Model(&models.SysFileInfo{Model: common.Model{
94+
Id: c.ID,
95+
}}).
9396
Scopes(
9497
actions.Permission(data.TableName(), p),
95-
).Where("id = ?", c.ID).Updates(&data).Error
98+
).Updates(&data).Error
9699
if err != nil {
97100
e.Log.Errorf("db error: %s", err)
98101
return err
@@ -112,7 +115,7 @@ func (e *SysFileInfo) RemoveSysFileInfo(d *dto.SysFileInfoById, p *actions.DataP
112115
db := e.Orm.Model(&data).
113116
Scopes(
114117
actions.Permission(data.TableName(), p),
115-
).Where(d.GetId()).Delete(&data)
118+
).Delete(&data, d.GetId())
116119
if db.Error != nil {
117120
err = db.Error
118121
e.Log.Errorf("Delete error: %s", err)

‎app/admin/service/sys_job.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ type SysJob struct {
1919
func (e *SysJob) RemoveJob(c *dto.GeneralDelDto) error {
2020
var err error
2121
var data models.SysJob
22-
data.JobId = c.Id
23-
err = e.Orm.Table(data.TableName()).First(&data).Error
22+
err = e.Orm.Table(data.TableName()).First(&data, c.Id).Error
2423
if err != nil {
2524
e.Log.Errorf("db error: %s", err)
2625
return err

‎app/admin/service/sys_login_log.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ func (e *SysLoginLog) UpdateSysLoginLog(c common.ActiveRecord) error {
7575
var data system.SysLoginLog
7676

7777
db := e.Orm.Model(&data).
78-
Where(c.GetId()).Updates(c)
78+
Where("id = ?", c.GetId()).Updates(c)
7979
if db.Error != nil {
8080
e.Log.Errorf("db error:%s", err)
8181
return err
@@ -92,8 +92,7 @@ func (e *SysLoginLog) RemoveSysLoginLog(d *dto.SysLoginLogById, c common.ActiveR
9292
var err error
9393
var data system.SysLoginLog
9494

95-
db := e.Orm.Model(&data).
96-
Where(d.Ids).Delete(c)
95+
db := e.Orm.Model(&data).Delete(c, d.Ids)
9796
if db.Error != nil {
9897
err = db.Error
9998
e.Log.Errorf("Delete error: %s", err)

0 commit comments

Comments
 (0)