diff --git a/apis/system/config.go b/apis/system/config.go index c74b900b..8517bc70 100644 --- a/apis/system/config.go +++ b/apis/system/config.go @@ -139,10 +139,11 @@ func UpdateConfig(c *gin.Context) { // @Router /api/v1/config/{configId} [delete] func DeleteConfig(c *gin.Context) { var data models.SysConfig - id, err := tools.StringToInt(c.Param("configId")) data.UpdateBy = tools.GetUserIdStr(c) - data.ConfigId = id - _, err = data.Delete() + IDS := tools.IdsStrToIdsIntGroup("configId", c) + result, err := data.BatchDelete(IDS) tools.HasError(err, "修改失败", 500) - app.OK(c, nil, msg.DeletedSuccess) + app.OK(c, result, msg.DeletedSuccess) } + + diff --git a/apis/system/dict/dictData.go b/apis/system/dict/dictData.go index 00a29cab..84c99506 100644 --- a/apis/system/dict/dictData.go +++ b/apis/system/dict/dictData.go @@ -144,12 +144,9 @@ func UpdateDictData(c *gin.Context) { // @Router /api/v1/dict/data/{dictCode} [delete] func DeleteDictData(c *gin.Context) { var data models.DictData - id, err := tools.StringToInt(c.Param("dictCode")) data.UpdateBy = tools.GetUserIdStr(c) - _, err = data.Delete(id) + IDS := tools.IdsStrToIdsIntGroup("dictCode", c) + result, err := data.BatchDelete(IDS) tools.HasError(err, "修改失败", 500) - - var res app.Response - res.Msg = "删除成功" - c.JSON(http.StatusOK, res.ReturnOK()) + app.OK(c,result,"删除成功") } diff --git a/apis/system/dict/dictType.go b/apis/system/dict/dictType.go index c7d2b193..41a76489 100644 --- a/apis/system/dict/dictType.go +++ b/apis/system/dict/dictType.go @@ -71,7 +71,6 @@ func GetDictType(c *gin.Context) { c.JSON(http.StatusOK, res.ReturnOK()) } - func GetDictTypeOptionSelect(c *gin.Context) { var DictType models.DictType DictType.DictName = c.Request.FormValue("dictName") @@ -136,13 +135,9 @@ func UpdateDictType(c *gin.Context) { // @Router /api/v1/dict/type/{dictId} [delete] func DeleteDictType(c *gin.Context) { var data models.DictType - id, err := tools.StringToInt(c.Param("dictId")) data.UpdateBy = tools.GetUserIdStr(c) - _, err = data.Delete(id) + IDS := tools.IdsStrToIdsIntGroup("dictId", c) + result, err := data.BatchDelete(IDS) tools.HasError(err, "修改失败", 500) - - c.JSON(http.StatusOK, gin.H{ - "code": 200, - "message": "删除成功", - }) + app.OK(c, result, "删除成功") } diff --git a/apis/system/post.go b/apis/system/post.go index 643c41b0..20350f33 100644 --- a/apis/system/post.go +++ b/apis/system/post.go @@ -106,9 +106,9 @@ func UpdatePost(c *gin.Context) { // @Router /api/v1/post/{postId} [delete] func DeletePost(c *gin.Context) { var data models.Post - id, err := tools.StringToInt(c.Param("postId")) data.UpdateBy = tools.GetUserIdStr(c) - _, err = data.Delete(id) + IDS := tools.IdsStrToIdsIntGroup("postId", c) + result, err := data.BatchDelete(IDS) tools.HasError(err, "删除失败", 500) - app.OK(c,"","删除成功") + app.OK(c,result,"删除成功") } diff --git a/models/config.go b/models/config.go index cb8a19ba..4ae67839 100644 --- a/models/config.go +++ b/models/config.go @@ -105,3 +105,11 @@ func (e *SysConfig) Delete() (success bool, err error) { success = true return } + +func (e *SysConfig) BatchDelete(id []int) (Result bool, err error) { + if err = orm.Eloquent.Table(e.TableName()).Where("config_id in (?)", id).Delete(&SysConfig{}).Error; err != nil { + return + } + Result = true + return +} diff --git a/models/dept.go b/models/dept.go index a679fe94..9e9d29d3 100644 --- a/models/dept.go +++ b/models/dept.go @@ -193,7 +193,7 @@ func (e *Dept) Update(id int) (update Dept, err error) { } func (e *Dept) Delete(id int) (success bool, err error) { - if err = orm.Eloquent.Table(e.TableName()).Where("dept_id = ?", e.DeptId).Delete(&Dept{}).Error; err != nil { + if err = orm.Eloquent.Table(e.TableName()).Where("dept_id = ?", id).Delete(&Dept{}).Error; err != nil { success = false return } diff --git a/models/dictData.go b/models/dictData.go index 16b8be4d..e07337d8 100644 --- a/models/dictData.go +++ b/models/dictData.go @@ -131,3 +131,12 @@ func (e *DictData) Delete(id int) (success bool, err error) { success = true return } + +func (e *DictData) BatchDelete(id []int) (Result bool, err error) { + if err = orm.Eloquent.Table(e.TableName()).Where("dict_code in (?)", id).Delete(&DictData{}).Error; err != nil { + return + } + Result = true + return +} + diff --git a/models/dictType.go b/models/dictType.go index 7235fa06..28c88a50 100644 --- a/models/dictType.go +++ b/models/dictType.go @@ -119,3 +119,11 @@ func (e *DictType) Delete(id int) (success bool, err error) { success = true return } + +func (e *DictType) BatchDelete(id []int) (Result bool, err error) { + if err = orm.Eloquent.Table(e.TableName()).Where("dict_id in (?)", id).Delete(&DictType{}).Error; err != nil { + return + } + Result = true + return +} diff --git a/models/post.go b/models/post.go index 68fa276a..2a85d8b1 100644 --- a/models/post.go +++ b/models/post.go @@ -129,3 +129,11 @@ func (e *Post) Delete(id int) (success bool, err error) { success = true return } + +func (e *Post) BatchDelete(id []int) (Result bool, err error) { + if err = orm.Eloquent.Table(e.TableName()).Where("post_id in (?)", id).Delete(&Post{}).Error; err != nil { + return + } + Result = true + return +}