作者 陈志颖

feat:编辑共创模式增加模式名称校验

... ... @@ -19,6 +19,7 @@ require (
github.com/onsi/ginkgo v1.14.2
github.com/onsi/gomega v1.10.3
github.com/sergi/go-diff v1.2.0 // indirect
github.com/shopspring/decimal v1.2.0
github.com/sirupsen/logrus v1.8.1 // indirect
github.com/smartystreets/goconvey v1.6.4 // indirect
github.com/valyala/fasthttp v1.28.0 // indirect
... ... @@ -27,5 +28,4 @@ require (
github.com/yudai/gojsondiff v1.0.0 // indirect
github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
github.com/yudai/pp v2.0.1+incompatible // indirect
github.com/shopspring/decimal v1.2.0
)
... ...
... ... @@ -223,6 +223,8 @@ github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ=
github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
github.com/shiena/ansicolor v0.0.0-20151119151921-a422bbe96644 h1:X+yvsM2yrEktyI+b2qND5gpH8YhURn0k8OCaeRnkINo=
github.com/shiena/ansicolor v0.0.0-20151119151921-a422bbe96644/go.mod h1:nkxAfR/5quYxwPZhyDxgasBMnRtBZd0FCEpawpjMUFg=
github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ=
github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
github.com/siddontang/go v0.0.0-20170517070808-cb568a3e5cc0/go.mod h1:3yhqj7WBBfRhbBlzyOC3gUxftwsU0u8gqevxwIHQpMw=
github.com/siddontang/goredis v0.0.0-20150324035039-760763f78400/go.mod h1:DDcKzU3qCuvj/tPnimWSsZZzvk9qvkvrIL5naVBPh5s=
github.com/siddontang/rdb v0.0.0-20150307021120-fc89ed2e418d/go.mod h1:AMEsy7v5z92TR1JKMkLLoaOQk++LVnOKL3ScbJ8GNGA=
... ...
... ... @@ -10,7 +10,7 @@ import (
type UpdateCooperationModeCommand struct {
// 共创模式ID
CooperationModeId int64 `cname:"共创模式id" json:"cooperationModeId" valid:"Required"`
CooperationModeId int64 `cname:"共创模式ID" json:"cooperationModeId" valid:"Required"`
// 共创模式名称
CooperationModeName string `cname:"共创模式名称" json:"cooperationModeName" valid:"Required"`
// 备注
... ...
... ... @@ -209,10 +209,8 @@ func (cooperationModeService *CooperationModeService) ListCooperationMode(listCo
return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
}
return map[string]interface{}{
//"grid": map[string]interface{}{
"list": cooperationModes,
"total": count,
//},
}, nil
}
}
... ... @@ -330,10 +328,8 @@ func (cooperationModeService *CooperationModeService) SearchCooperationMode(sear
return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
}
return map[string]interface{}{
//"grid": map[string]interface{}{
"list": cooperationModes,
"total": count,
//},
}, nil
}
}
... ... @@ -361,6 +357,25 @@ func (cooperationModeService *CooperationModeService) UpdateCooperationMode(upda
} else {
cooperationModeRepository = value
}
// 共创模式DAO初始化
var cooperationModeDao *dao.CooperationModeDao
if value, err := factory.CreateCooperationModeDao(map[string]interface{}{
"transactionContext": transactionContext,
}); err != nil {
return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
} else {
cooperationModeDao = value
}
// 校验共创模式名称唯一性
nameAvailable, _ := cooperationModeDao.CheckModeNameAvailable(map[string]interface{}{
"companyId": updateCooperationModeCommand.CompanyId,
"orgId": updateCooperationModeCommand.OrgId,
"cooperationModeName": updateCooperationModeCommand.CooperationModeName,
})
if !nameAvailable {
return nil, application.ThrowError(application.TRANSACTION_ERROR, "模式名称已存在")
}
cooperationMode, err := cooperationModeRepository.FindOne(map[string]interface{}{"cooperationModeId": updateCooperationModeCommand.CooperationModeId})
if err != nil {
return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
... ...