fix: dictionary does not exist

arklnk · Aug 27, 2022 · 379a132 · 379a132
1 parent 313bbbd
commit 379a132
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 0 deletions.
diff --git a/app/core/cmd/api/internal/logic/config/dict/addconfigdictlogic.go b/app/core/cmd/api/internal/logic/config/dict/addconfigdictlogic.go
@@ -6,6 +6,7 @@ import (
 	"ark-admin-zero/app/core/cmd/api/internal/svc"
 	"ark-admin-zero/app/core/cmd/api/internal/types"
 	"ark-admin-zero/app/core/model"
+	"ark-admin-zero/common/config"
 	"ark-admin-zero/common/errorx"
 
 	"github.com/jinzhu/copier"
@@ -27,6 +28,12 @@ func NewAddConfigDictLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Add
 }
 
 func (l *AddConfigDictLogic) AddConfigDict(req *types.AddConfigDictReq) error {
+	if req.ParentId != config.SysTopParentId {
+		_, err := l.svcCtx.SysDictionaryModel.FindOne(l.ctx, req.ParentId)
+		if err != nil {
+			return errorx.NewDefaultError(errorx.ParentDictionaryIdErrorCode)
+		}
+	}
 	_, err := l.svcCtx.SysDictionaryModel.FindOneByUniqueKey(l.ctx, req.UniqueKey)
 	if err == model.ErrNotFound {
 		var dictionary = new(model.SysDictionary)

diff --git a/app/core/cmd/api/internal/logic/config/dict/updateconfigdictlogic.go b/app/core/cmd/api/internal/logic/config/dict/updateconfigdictlogic.go
@@ -5,6 +5,7 @@ import (
 
 	"ark-admin-zero/app/core/cmd/api/internal/svc"
 	"ark-admin-zero/app/core/cmd/api/internal/types"
+	"ark-admin-zero/common/config"
 	"ark-admin-zero/common/errorx"
 
 	"github.com/jinzhu/copier"
@@ -26,6 +27,13 @@ func NewUpdateConfigDictLogic(ctx context.Context, svcCtx *svc.ServiceContext) *
 }
 
 func (l *UpdateConfigDictLogic) UpdateConfigDict(req *types.UpdateConfigDictReq) error {
+	if req.ParentId != config.SysTopParentId {
+		_, err := l.svcCtx.SysDictionaryModel.FindOne(l.ctx, req.ParentId)
+		if err != nil {
+			return errorx.NewDefaultError(errorx.ParentDictionaryIdErrorCode)
+		}
+	}
+
 	configDictionary, err := l.svcCtx.SysDictionaryModel.FindOne(l.ctx, req.Id)
 	if err != nil {
 		return errorx.NewDefaultError(errorx.ServerErrorCode)

diff --git a/common/errorx/errormsg.go b/common/errorx/errormsg.go
@@ -43,6 +43,7 @@ const (
 	ParentRoleIdErrorCode        = 1037
 	ParentDeptIdErrorCode        = 1038
 	ParentPermMenuIdErrorCode    = 1039
+	ParentDictionaryIdErrorCode  = 1040
 )
 
 func init() {
@@ -86,6 +87,7 @@ func init() {
 	errorMsg[ParentRoleIdErrorCode] = "父级角色不存在"
 	errorMsg[ParentDeptIdErrorCode] = "父级部门不存在"
 	errorMsg[ParentPermMenuIdErrorCode] = "父级菜单不存在"
+	errorMsg[ParentDictionaryIdErrorCode] = "字典集不存在"
 }
 
 func MapErrMsg(errCode int) string {