mirror of
https://github.com/go-admin-team/go-admin.git
synced 2026-09-20 17:57:54 +00:00
修复新代码报错
This commit is contained in:
@@ -9,7 +9,6 @@ import (
|
||||
"go-admin/app/admin/service/dto"
|
||||
"go-admin/common/actions"
|
||||
"go-admin/common/apis"
|
||||
"go-admin/common/log"
|
||||
"go-admin/tools"
|
||||
)
|
||||
|
||||
@@ -18,11 +17,12 @@ type WfProcessClassify struct {
|
||||
}
|
||||
|
||||
func (e *WfProcessClassify) GetWfProcessClassifyList(c *gin.Context) {
|
||||
msgID := tools.GenerateMsgIDFromContext(c)
|
||||
log := e.GetLogger(c)
|
||||
d := new(dto.WfProcessClassifySearch)
|
||||
db, err := tools.GetOrm(c)
|
||||
if err != nil {
|
||||
log.Error(err)
|
||||
log.Errorf("get db connection error, %s", err.Error())
|
||||
e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
|
||||
return
|
||||
}
|
||||
|
||||
@@ -39,11 +39,12 @@ func (e *WfProcessClassify) GetWfProcessClassifyList(c *gin.Context) {
|
||||
list := make([]models.WfProcessClassify, 0)
|
||||
var count int64
|
||||
serviceStudent := service.WfProcessClassify{}
|
||||
serviceStudent.MsgID = msgID
|
||||
serviceStudent.Log = log
|
||||
serviceStudent.Orm = db
|
||||
err = serviceStudent.GetWfProcessClassifyPage(d, p, &list, &count)
|
||||
if err != nil {
|
||||
e.Error(c, http.StatusUnprocessableEntity, err, "查询失败")
|
||||
log.Errorf("GetWfProcessClassifyPage error, %s", err)
|
||||
e.Error(c, http.StatusInternalServerError, err, "查询失败")
|
||||
return
|
||||
}
|
||||
|
||||
@@ -51,14 +52,15 @@ func (e *WfProcessClassify) GetWfProcessClassifyList(c *gin.Context) {
|
||||
}
|
||||
|
||||
func (e *WfProcessClassify) GetWfProcessClassify(c *gin.Context) {
|
||||
log := e.GetLogger(c)
|
||||
control := new(dto.WfProcessClassifyById)
|
||||
db, err := tools.GetOrm(c)
|
||||
if err != nil {
|
||||
log.Error(err)
|
||||
log.Errorf("get db connection error, %s", err.Error())
|
||||
e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
|
||||
return
|
||||
}
|
||||
|
||||
msgID := tools.GenerateMsgIDFromContext(c)
|
||||
//查看详情
|
||||
err = control.Bind(c)
|
||||
if err != nil {
|
||||
@@ -71,11 +73,12 @@ func (e *WfProcessClassify) GetWfProcessClassify(c *gin.Context) {
|
||||
p := actions.GetPermissionFromContext(c)
|
||||
|
||||
serviceWfProcessClassify := service.WfProcessClassify{}
|
||||
serviceWfProcessClassify.MsgID = msgID
|
||||
serviceWfProcessClassify.Log = log
|
||||
serviceWfProcessClassify.Orm = db
|
||||
err = serviceWfProcessClassify.GetWfProcessClassify(control, p, &object)
|
||||
if err != nil {
|
||||
e.Error(c, http.StatusUnprocessableEntity, err, "查询失败")
|
||||
log.Errorf("GetWfProcessClassify error, %s", err)
|
||||
e.Error(c, http.StatusInternalServerError, err, "查询失败")
|
||||
return
|
||||
}
|
||||
|
||||
@@ -83,14 +86,15 @@ func (e *WfProcessClassify) GetWfProcessClassify(c *gin.Context) {
|
||||
}
|
||||
|
||||
func (e *WfProcessClassify) InsertWfProcessClassify(c *gin.Context) {
|
||||
log := e.GetLogger(c)
|
||||
control := new(dto.WfProcessClassifyControl)
|
||||
db, err := tools.GetOrm(c)
|
||||
if err != nil {
|
||||
log.Error(err)
|
||||
log.Errorf("get db connection error, %s", err.Error())
|
||||
e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
|
||||
return
|
||||
}
|
||||
|
||||
msgID := tools.GenerateMsgIDFromContext(c)
|
||||
//新增操作
|
||||
err = control.Bind(c)
|
||||
if err != nil {
|
||||
@@ -107,10 +111,10 @@ func (e *WfProcessClassify) InsertWfProcessClassify(c *gin.Context) {
|
||||
|
||||
serviceWfProcessClassify := service.WfProcessClassify{}
|
||||
serviceWfProcessClassify.Orm = db
|
||||
serviceWfProcessClassify.MsgID = msgID
|
||||
serviceWfProcessClassify.Log = log
|
||||
err = serviceWfProcessClassify.InsertWfProcessClassify(object)
|
||||
if err != nil {
|
||||
log.Error(err)
|
||||
log.Errorf("InsertWfProcessClassify error, %s", err)
|
||||
e.Error(c, http.StatusInternalServerError, err, "创建失败")
|
||||
return
|
||||
}
|
||||
@@ -119,14 +123,15 @@ func (e *WfProcessClassify) InsertWfProcessClassify(c *gin.Context) {
|
||||
}
|
||||
|
||||
func (e *WfProcessClassify) UpdateWfProcessClassify(c *gin.Context) {
|
||||
log := e.GetLogger(c)
|
||||
control := new(dto.WfProcessClassifyControl)
|
||||
db, err := tools.GetOrm(c)
|
||||
if err != nil {
|
||||
log.Error(err)
|
||||
log.Errorf("get db connection error, %s", err.Error())
|
||||
e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
|
||||
return
|
||||
}
|
||||
|
||||
msgID := tools.GenerateMsgIDFromContext(c)
|
||||
//更新操作
|
||||
err = control.Bind(c)
|
||||
if err != nil {
|
||||
@@ -145,28 +150,30 @@ func (e *WfProcessClassify) UpdateWfProcessClassify(c *gin.Context) {
|
||||
|
||||
serviceWfProcessClassify := service.WfProcessClassify{}
|
||||
serviceWfProcessClassify.Orm = db
|
||||
serviceWfProcessClassify.MsgID = msgID
|
||||
serviceWfProcessClassify.Log = log
|
||||
err = serviceWfProcessClassify.UpdateWfProcessClassify(object, p)
|
||||
if err != nil {
|
||||
log.Error(err)
|
||||
log.Errorf("UpdateWfProcessClassify error, %s", err)
|
||||
e.Error(c, http.StatusInternalServerError, err, "更新失败")
|
||||
return
|
||||
}
|
||||
e.OK(c, object.GetId(), "更新成功")
|
||||
}
|
||||
|
||||
func (e *WfProcessClassify) DeleteWfProcessClassify(c *gin.Context) {
|
||||
log := e.GetLogger(c)
|
||||
control := new(dto.WfProcessClassifyById)
|
||||
db, err := tools.GetOrm(c)
|
||||
if err != nil {
|
||||
log.Error(err)
|
||||
log.Errorf("get db connection error, %s", err.Error())
|
||||
e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
|
||||
return
|
||||
}
|
||||
|
||||
msgID := tools.GenerateMsgIDFromContext(c)
|
||||
//删除操作
|
||||
err = control.Bind(c)
|
||||
if err != nil {
|
||||
log.Errorf("MsgID[%s] Bind error: %s", msgID, err)
|
||||
log.Warnf("Bind error: %s", err)
|
||||
e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
|
||||
return
|
||||
}
|
||||
@@ -179,10 +186,11 @@ func (e *WfProcessClassify) DeleteWfProcessClassify(c *gin.Context) {
|
||||
|
||||
serviceWfProcessClassify := service.WfProcessClassify{}
|
||||
serviceWfProcessClassify.Orm = db
|
||||
serviceWfProcessClassify.MsgID = msgID
|
||||
serviceWfProcessClassify.Log = log
|
||||
err = serviceWfProcessClassify.RemoveWfProcessClassify(control, p)
|
||||
if err != nil {
|
||||
log.Error(err)
|
||||
log.Errorf("RemoveWfProcessClassify error, %s", err)
|
||||
e.Error(c, http.StatusInternalServerError, err, "删除失败")
|
||||
return
|
||||
}
|
||||
e.OK(c, control.GetId(), "删除成功")
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
package sys_china_area_data
|
||||
|
||||
import (
|
||||
"github.com/gin-gonic/gin"
|
||||
"go-admin/app/admin/service"
|
||||
"net/http"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
|
||||
"go-admin/app/admin/models"
|
||||
"go-admin/app/admin/service"
|
||||
"go-admin/app/admin/service/dto"
|
||||
"go-admin/common/actions"
|
||||
"go-admin/common/apis"
|
||||
"go-admin/common/log"
|
||||
"go-admin/tools"
|
||||
)
|
||||
|
||||
@@ -18,11 +18,12 @@ type SysChinaAreaData struct {
|
||||
}
|
||||
|
||||
func (e *SysChinaAreaData) GetSysChinaAreaDataList(c *gin.Context) {
|
||||
msgID := tools.GenerateMsgIDFromContext(c)
|
||||
log := e.GetLogger(c)
|
||||
d := new(dto.SysChinaAreaDataSearch)
|
||||
db, err := tools.GetOrm(c)
|
||||
if err != nil {
|
||||
log.Error(err)
|
||||
log.Errorf("get db connection error, %s", err.Error())
|
||||
e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
|
||||
return
|
||||
}
|
||||
|
||||
@@ -39,11 +40,11 @@ func (e *SysChinaAreaData) GetSysChinaAreaDataList(c *gin.Context) {
|
||||
list := make([]models.SysChinaAreaData, 0)
|
||||
var count int64
|
||||
serviceStudent := service.SysChinaAreaData{}
|
||||
serviceStudent.MsgID = msgID
|
||||
serviceStudent.Log = log
|
||||
serviceStudent.Orm = db
|
||||
err = serviceStudent.GetSysChinaAreaDataPage(d, p, &list, &count)
|
||||
if err != nil {
|
||||
e.Error(c, http.StatusUnprocessableEntity, err, "查询失败")
|
||||
e.Error(c, http.StatusInternalServerError, err, "查询失败")
|
||||
return
|
||||
}
|
||||
|
||||
@@ -51,14 +52,15 @@ func (e *SysChinaAreaData) GetSysChinaAreaDataList(c *gin.Context) {
|
||||
}
|
||||
|
||||
func (e *SysChinaAreaData) GetSysChinaAreaData(c *gin.Context) {
|
||||
log := e.GetLogger(c)
|
||||
control := new(dto.SysChinaAreaDataById)
|
||||
db, err := tools.GetOrm(c)
|
||||
if err != nil {
|
||||
log.Error(err)
|
||||
log.Errorf("get db connection error, %s", err.Error())
|
||||
e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
|
||||
return
|
||||
}
|
||||
|
||||
msgID := tools.GenerateMsgIDFromContext(c)
|
||||
//查看详情
|
||||
err = control.Bind(c)
|
||||
if err != nil {
|
||||
@@ -71,7 +73,7 @@ func (e *SysChinaAreaData) GetSysChinaAreaData(c *gin.Context) {
|
||||
p := actions.GetPermissionFromContext(c)
|
||||
|
||||
serviceSysChinaAreaData := service.SysChinaAreaData{}
|
||||
serviceSysChinaAreaData.MsgID = msgID
|
||||
serviceSysChinaAreaData.Log = log
|
||||
serviceSysChinaAreaData.Orm = db
|
||||
err = serviceSysChinaAreaData.GetSysChinaAreaData(control, p, &object)
|
||||
if err != nil {
|
||||
@@ -83,14 +85,15 @@ func (e *SysChinaAreaData) GetSysChinaAreaData(c *gin.Context) {
|
||||
}
|
||||
|
||||
func (e *SysChinaAreaData) InsertSysChinaAreaData(c *gin.Context) {
|
||||
log := e.GetLogger(c)
|
||||
control := new(dto.SysChinaAreaDataControl)
|
||||
db, err := tools.GetOrm(c)
|
||||
if err != nil {
|
||||
log.Error(err)
|
||||
log.Errorf("get db connection error, %s", err.Error())
|
||||
e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
|
||||
return
|
||||
}
|
||||
|
||||
msgID := tools.GenerateMsgIDFromContext(c)
|
||||
//新增操作
|
||||
err = control.Bind(c)
|
||||
if err != nil {
|
||||
@@ -107,7 +110,7 @@ func (e *SysChinaAreaData) InsertSysChinaAreaData(c *gin.Context) {
|
||||
|
||||
serviceSysChinaAreaData := service.SysChinaAreaData{}
|
||||
serviceSysChinaAreaData.Orm = db
|
||||
serviceSysChinaAreaData.MsgID = msgID
|
||||
serviceSysChinaAreaData.Log = log
|
||||
err = serviceSysChinaAreaData.InsertSysChinaAreaData(object)
|
||||
if err != nil {
|
||||
log.Error(err)
|
||||
@@ -119,14 +122,15 @@ func (e *SysChinaAreaData) InsertSysChinaAreaData(c *gin.Context) {
|
||||
}
|
||||
|
||||
func (e *SysChinaAreaData) UpdateSysChinaAreaData(c *gin.Context) {
|
||||
log := e.GetLogger(c)
|
||||
control := new(dto.SysChinaAreaDataControl)
|
||||
db, err := tools.GetOrm(c)
|
||||
if err != nil {
|
||||
log.Error(err)
|
||||
log.Errorf("get db connection error, %s", err.Error())
|
||||
e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
|
||||
return
|
||||
}
|
||||
|
||||
msgID := tools.GenerateMsgIDFromContext(c)
|
||||
//更新操作
|
||||
err = control.Bind(c)
|
||||
if err != nil {
|
||||
@@ -145,7 +149,7 @@ func (e *SysChinaAreaData) UpdateSysChinaAreaData(c *gin.Context) {
|
||||
|
||||
serviceSysChinaAreaData := service.SysChinaAreaData{}
|
||||
serviceSysChinaAreaData.Orm = db
|
||||
serviceSysChinaAreaData.MsgID = msgID
|
||||
serviceSysChinaAreaData.Log = log
|
||||
err = serviceSysChinaAreaData.UpdateSysChinaAreaData(object, p)
|
||||
if err != nil {
|
||||
log.Error(err)
|
||||
@@ -155,18 +159,19 @@ func (e *SysChinaAreaData) UpdateSysChinaAreaData(c *gin.Context) {
|
||||
}
|
||||
|
||||
func (e *SysChinaAreaData) DeleteSysChinaAreaData(c *gin.Context) {
|
||||
log := e.GetLogger(c)
|
||||
control := new(dto.SysChinaAreaDataById)
|
||||
db, err := tools.GetOrm(c)
|
||||
if err != nil {
|
||||
log.Error(err)
|
||||
log.Errorf("get db connection error, %s", err.Error())
|
||||
e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
|
||||
return
|
||||
}
|
||||
|
||||
msgID := tools.GenerateMsgIDFromContext(c)
|
||||
//删除操作
|
||||
err = control.Bind(c)
|
||||
if err != nil {
|
||||
log.Errorf("MsgID[%s] Bind error: %s", msgID, err)
|
||||
log.Errorf("Bind error: %s", err)
|
||||
e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
|
||||
return
|
||||
}
|
||||
@@ -179,11 +184,12 @@ func (e *SysChinaAreaData) DeleteSysChinaAreaData(c *gin.Context) {
|
||||
|
||||
serviceSysChinaAreaData := service.SysChinaAreaData{}
|
||||
serviceSysChinaAreaData.Orm = db
|
||||
serviceSysChinaAreaData.MsgID = msgID
|
||||
serviceSysChinaAreaData.Log = log
|
||||
err = serviceSysChinaAreaData.RemoveSysChinaAreaData(control, p)
|
||||
if err != nil {
|
||||
log.Error(err)
|
||||
log.Errorf("RemoveSysChinaAreaData error, %s", err)
|
||||
e.Error(c, http.StatusInternalServerError, err, "删除失败")
|
||||
return
|
||||
}
|
||||
e.OK(c, control.GetId(), "删除成功")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,20 +2,18 @@ package dto
|
||||
|
||||
import (
|
||||
"github.com/gin-gonic/gin"
|
||||
"go-admin/pkg/logger"
|
||||
|
||||
//"gorm.io/gorm"
|
||||
|
||||
"go-admin/app/admin/models"
|
||||
"go-admin/common/dto"
|
||||
"go-admin/common/log"
|
||||
common "go-admin/common/models"
|
||||
"go-admin/tools"
|
||||
)
|
||||
|
||||
type WfProcessClassifySearch struct {
|
||||
dto.Pagination `search:"-"`
|
||||
Name string `form:"name" search:"type:contains;column:name;table:wf_process_classify" comment:"名称"`
|
||||
|
||||
|
||||
dto.Pagination `search:"-"`
|
||||
Name string `form:"name" search:"type:contains;column:name;table:wf_process_classify" comment:"名称"`
|
||||
}
|
||||
|
||||
func (m *WfProcessClassifySearch) GetNeedSearch() interface{} {
|
||||
@@ -23,41 +21,39 @@ func (m *WfProcessClassifySearch) GetNeedSearch() interface{} {
|
||||
}
|
||||
|
||||
func (m *WfProcessClassifySearch) Bind(ctx *gin.Context) error {
|
||||
msgID := tools.GenerateMsgIDFromContext(ctx)
|
||||
err := ctx.ShouldBind(m)
|
||||
if err != nil {
|
||||
log.Debugf("MsgID[%s] ShouldBind error: %s", msgID, err.Error())
|
||||
}
|
||||
return err
|
||||
log := logger.GetRequestLogger(ctx)
|
||||
err := ctx.ShouldBind(m)
|
||||
if err != nil {
|
||||
log.Debugf("ShouldBind error: %s", err.Error())
|
||||
}
|
||||
return err
|
||||
}
|
||||
|
||||
type WfProcessClassifyControl struct {
|
||||
|
||||
Id int `uri:"id" comment:"编码"` // 编码
|
||||
Id int `uri:"id" comment:"编码"` // 编码
|
||||
|
||||
Name string `json:"name" comment:"名称"`
|
||||
|
||||
Name string `json:"name" comment:"名称"`
|
||||
}
|
||||
|
||||
func (s *WfProcessClassifyControl) Bind(ctx *gin.Context) error {
|
||||
msgID := tools.GenerateMsgIDFromContext(ctx)
|
||||
err := ctx.ShouldBindUri(s)
|
||||
if err != nil {
|
||||
log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error())
|
||||
return err
|
||||
}
|
||||
err = ctx.ShouldBind(s)
|
||||
if err != nil {
|
||||
log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
|
||||
}
|
||||
return err
|
||||
log := logger.GetRequestLogger(ctx)
|
||||
err := ctx.ShouldBindUri(s)
|
||||
if err != nil {
|
||||
log.Debugf("ShouldBindUri error: %s", err.Error())
|
||||
return err
|
||||
}
|
||||
err = ctx.ShouldBind(s)
|
||||
if err != nil {
|
||||
log.Debugf("ShouldBind error: %#v", err.Error())
|
||||
}
|
||||
return err
|
||||
}
|
||||
|
||||
func (s *WfProcessClassifyControl) Generate() (*models.WfProcessClassify, error) {
|
||||
return &models.WfProcessClassify{
|
||||
|
||||
Model: common.Model{ Id: s.Id },
|
||||
Name: s.Name,
|
||||
|
||||
Model: common.Model{Id: s.Id},
|
||||
Name: s.Name,
|
||||
}, nil
|
||||
}
|
||||
|
||||
@@ -79,19 +75,19 @@ func (s *WfProcessClassifyById) GetId() interface{} {
|
||||
}
|
||||
|
||||
func (s *WfProcessClassifyById) Bind(ctx *gin.Context) error {
|
||||
msgID := tools.GenerateMsgIDFromContext(ctx)
|
||||
log := logger.GetRequestLogger(ctx)
|
||||
err := ctx.ShouldBindUri(s)
|
||||
if err != nil {
|
||||
log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error())
|
||||
log.Debugf("ShouldBindUri error: %s", err.Error())
|
||||
return err
|
||||
}
|
||||
err = ctx.ShouldBind(s)
|
||||
if err != nil {
|
||||
log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
|
||||
log.Debugf("ShouldBind error: %#v", err.Error())
|
||||
}
|
||||
return err
|
||||
}
|
||||
|
||||
func (s *WfProcessClassifyById) SetUpdateBy(id int) {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,13 +2,14 @@ package service
|
||||
|
||||
import (
|
||||
"errors"
|
||||
|
||||
"gorm.io/gorm"
|
||||
|
||||
"go-admin/app/admin/models"
|
||||
"go-admin/app/admin/service/dto"
|
||||
"go-admin/common/actions"
|
||||
cDto "go-admin/common/dto"
|
||||
"go-admin/common/log"
|
||||
"go-admin/app/admin/service/dto"
|
||||
"go-admin/common/service"
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
type SysChinaAreaData struct {
|
||||
@@ -19,7 +20,6 @@ type SysChinaAreaData struct {
|
||||
func (e *SysChinaAreaData) GetSysChinaAreaDataPage(c *dto.SysChinaAreaDataSearch, p *actions.DataPermission, list *[]models.SysChinaAreaData, count *int64) error {
|
||||
var err error
|
||||
var data models.SysChinaAreaData
|
||||
msgID := e.MsgID
|
||||
|
||||
err = e.Orm.Model(&data).
|
||||
Scopes(
|
||||
@@ -30,7 +30,7 @@ func (e *SysChinaAreaData) GetSysChinaAreaDataPage(c *dto.SysChinaAreaDataSearch
|
||||
Find(list).Limit(-1).Offset(-1).
|
||||
Count(count).Error
|
||||
if err != nil {
|
||||
log.Errorf("msgID[%s] db error:%s", msgID, err)
|
||||
e.Log.Errorf("db error:%s", err)
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
@@ -40,7 +40,6 @@ func (e *SysChinaAreaData) GetSysChinaAreaDataPage(c *dto.SysChinaAreaDataSearch
|
||||
func (e *SysChinaAreaData) GetSysChinaAreaData(d *dto.SysChinaAreaDataById, p *actions.DataPermission, model *models.SysChinaAreaData) error {
|
||||
var err error
|
||||
var data models.SysChinaAreaData
|
||||
msgID := e.MsgID
|
||||
|
||||
db := e.Orm.Model(&data).
|
||||
Scopes(
|
||||
@@ -50,11 +49,11 @@ func (e *SysChinaAreaData) GetSysChinaAreaData(d *dto.SysChinaAreaDataById, p *a
|
||||
err = db.Error
|
||||
if err != nil && errors.Is(err, gorm.ErrRecordNotFound) {
|
||||
err = errors.New("查看对象不存在或无权查看")
|
||||
log.Errorf("msgID[%s] db error:%s", msgID, err)
|
||||
e.Log.Errorf("db error:%s", err)
|
||||
return err
|
||||
}
|
||||
if db.Error != nil {
|
||||
log.Errorf("msgID[%s] db error:%s", msgID, err)
|
||||
e.Log.Errorf("db error:%s", err)
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
@@ -64,12 +63,11 @@ func (e *SysChinaAreaData) GetSysChinaAreaData(d *dto.SysChinaAreaDataById, p *a
|
||||
func (e *SysChinaAreaData) InsertSysChinaAreaData(model *models.SysChinaAreaData) error {
|
||||
var err error
|
||||
var data models.SysChinaAreaData
|
||||
msgID := e.MsgID
|
||||
|
||||
err = e.Orm.Model(&data).
|
||||
Create(model).Error
|
||||
if err != nil {
|
||||
log.Errorf("msgID[%s] db error:%s", msgID, err)
|
||||
e.Log.Errorf("db error:%s", err)
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
@@ -79,14 +77,13 @@ func (e *SysChinaAreaData) InsertSysChinaAreaData(model *models.SysChinaAreaData
|
||||
func (e *SysChinaAreaData) UpdateSysChinaAreaData(c *models.SysChinaAreaData, p *actions.DataPermission) error {
|
||||
var err error
|
||||
var data models.SysChinaAreaData
|
||||
msgID := e.MsgID
|
||||
|
||||
db := e.Orm.Model(&data).
|
||||
Scopes(
|
||||
actions.Permission(data.TableName(), p),
|
||||
).Where(c.GetId()).Updates(c)
|
||||
if db.Error != nil {
|
||||
log.Errorf("msgID[%s] db error:%s", msgID, err)
|
||||
e.Log.Errorf("db error:%s", err)
|
||||
return err
|
||||
}
|
||||
if db.RowsAffected == 0 {
|
||||
@@ -100,7 +97,6 @@ func (e *SysChinaAreaData) UpdateSysChinaAreaData(c *models.SysChinaAreaData, p
|
||||
func (e *SysChinaAreaData) RemoveSysChinaAreaData(d *dto.SysChinaAreaDataById, p *actions.DataPermission) error {
|
||||
var err error
|
||||
var data models.SysChinaAreaData
|
||||
msgID := e.MsgID
|
||||
|
||||
db := e.Orm.Model(&data).
|
||||
Scopes(
|
||||
@@ -108,7 +104,7 @@ func (e *SysChinaAreaData) RemoveSysChinaAreaData(d *dto.SysChinaAreaDataById, p
|
||||
).Delete(&data, d.GetId())
|
||||
if db.Error != nil {
|
||||
err = db.Error
|
||||
log.Errorf("MsgID[%s] Delete error: %s", msgID, err)
|
||||
e.Log.Errorf("Delete error: %s", err)
|
||||
return err
|
||||
}
|
||||
if db.RowsAffected == 0 {
|
||||
@@ -116,4 +112,4 @@ func (e *SysChinaAreaData) RemoveSysChinaAreaData(d *dto.SysChinaAreaDataById, p
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,13 +2,14 @@ package service
|
||||
|
||||
import (
|
||||
"errors"
|
||||
|
||||
"gorm.io/gorm"
|
||||
|
||||
"go-admin/app/admin/models"
|
||||
"go-admin/app/admin/service/dto"
|
||||
"go-admin/common/actions"
|
||||
cDto "go-admin/common/dto"
|
||||
"go-admin/common/log"
|
||||
"go-admin/app/admin/service/dto"
|
||||
"go-admin/common/service"
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
type WfProcessClassify struct {
|
||||
@@ -19,7 +20,6 @@ type WfProcessClassify struct {
|
||||
func (e *WfProcessClassify) GetWfProcessClassifyPage(c *dto.WfProcessClassifySearch, p *actions.DataPermission, list *[]models.WfProcessClassify, count *int64) error {
|
||||
var err error
|
||||
var data models.WfProcessClassify
|
||||
msgID := e.MsgID
|
||||
|
||||
err = e.Orm.Model(&data).
|
||||
Scopes(
|
||||
@@ -30,7 +30,7 @@ func (e *WfProcessClassify) GetWfProcessClassifyPage(c *dto.WfProcessClassifySea
|
||||
Find(list).Limit(-1).Offset(-1).
|
||||
Count(count).Error
|
||||
if err != nil {
|
||||
log.Errorf("msgID[%s] db error:%s", msgID, err)
|
||||
e.Log.Errorf("db error:%s", err)
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
@@ -40,7 +40,6 @@ func (e *WfProcessClassify) GetWfProcessClassifyPage(c *dto.WfProcessClassifySea
|
||||
func (e *WfProcessClassify) GetWfProcessClassify(d *dto.WfProcessClassifyById, p *actions.DataPermission, model *models.WfProcessClassify) error {
|
||||
var err error
|
||||
var data models.WfProcessClassify
|
||||
msgID := e.MsgID
|
||||
|
||||
db := e.Orm.Model(&data).
|
||||
Scopes(
|
||||
@@ -50,11 +49,11 @@ func (e *WfProcessClassify) GetWfProcessClassify(d *dto.WfProcessClassifyById, p
|
||||
err = db.Error
|
||||
if err != nil && errors.Is(err, gorm.ErrRecordNotFound) {
|
||||
err = errors.New("查看对象不存在或无权查看")
|
||||
log.Errorf("msgID[%s] db error:%s", msgID, err)
|
||||
e.Log.Errorf("db error:%s", err)
|
||||
return err
|
||||
}
|
||||
if db.Error != nil {
|
||||
log.Errorf("msgID[%s] db error:%s", msgID, err)
|
||||
e.Log.Errorf("db error:%s", err)
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
@@ -64,12 +63,11 @@ func (e *WfProcessClassify) GetWfProcessClassify(d *dto.WfProcessClassifyById, p
|
||||
func (e *WfProcessClassify) InsertWfProcessClassify(model *models.WfProcessClassify) error {
|
||||
var err error
|
||||
var data models.WfProcessClassify
|
||||
msgID := e.MsgID
|
||||
|
||||
err = e.Orm.Model(&data).
|
||||
Create(model).Error
|
||||
if err != nil {
|
||||
log.Errorf("msgID[%s] db error:%s", msgID, err)
|
||||
e.Log.Errorf("db error:%s", err)
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
@@ -79,14 +77,13 @@ func (e *WfProcessClassify) InsertWfProcessClassify(model *models.WfProcessClass
|
||||
func (e *WfProcessClassify) UpdateWfProcessClassify(c *models.WfProcessClassify, p *actions.DataPermission) error {
|
||||
var err error
|
||||
var data models.WfProcessClassify
|
||||
msgID := e.MsgID
|
||||
|
||||
db := e.Orm.Model(&data).
|
||||
Scopes(
|
||||
actions.Permission(data.TableName(), p),
|
||||
).Where(c.GetId()).Updates(c)
|
||||
if db.Error != nil {
|
||||
log.Errorf("msgID[%s] db error:%s", msgID, err)
|
||||
e.Log.Errorf("db error:%s", err)
|
||||
return err
|
||||
}
|
||||
if db.RowsAffected == 0 {
|
||||
@@ -100,7 +97,6 @@ func (e *WfProcessClassify) UpdateWfProcessClassify(c *models.WfProcessClassify,
|
||||
func (e *WfProcessClassify) RemoveWfProcessClassify(d *dto.WfProcessClassifyById, p *actions.DataPermission) error {
|
||||
var err error
|
||||
var data models.WfProcessClassify
|
||||
msgID := e.MsgID
|
||||
|
||||
db := e.Orm.Model(&data).
|
||||
Scopes(
|
||||
@@ -108,7 +104,7 @@ func (e *WfProcessClassify) RemoveWfProcessClassify(d *dto.WfProcessClassifyById
|
||||
).Delete(&data, d.GetId())
|
||||
if db.Error != nil {
|
||||
err = db.Error
|
||||
log.Errorf("MsgID[%s] Delete error: %s", msgID, err)
|
||||
e.Log.Errorf("Delete error: %s", err)
|
||||
return err
|
||||
}
|
||||
if db.RowsAffected == 0 {
|
||||
@@ -116,4 +112,4 @@ func (e *WfProcessClassify) RemoveWfProcessClassify(d *dto.WfProcessClassifyById
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user