fix: role does not exist

arklnk · Aug 26, 2022 · cd3fe15 · cd3fe15
1 parent 034cfa8
commit cd3fe15
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/app/core/cmd/api/internal/logic/sys/role/addsysrolelogic.go b/app/core/cmd/api/internal/logic/sys/role/addsysrolelogic.go
@@ -30,6 +30,13 @@ func NewAddSysRoleLogic(ctx context.Context, svcCtx *svc.ServiceContext) *AddSys
 func (l *AddSysRoleLogic) AddSysRole(req *types.AddSysRoleReq) error {
 	_, err := l.svcCtx.SysRoleModel.FindOneByUniqueKey(l.ctx, req.UniqueKey)
 	if err == model.ErrNotFound {
+		if req.ParentId != 0 {
+			_, err := l.svcCtx.SysRoleModel.FindOne(l.ctx,req.ParentId)
+			if err != nil {
+				return errorx.NewDefaultError(errorx.ParentRoleIdErrorCode)
+			}
+		}
+
 		var sysRole = new(model.SysRole)
 		err = copier.Copy(sysRole, req)
 		if err != nil {

diff --git a/app/core/cmd/api/internal/logic/sys/role/updatesysrolelogic.go b/app/core/cmd/api/internal/logic/sys/role/updatesysrolelogic.go
@@ -30,6 +30,13 @@ func NewUpdateSysRoleLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Upd
 }
 
 func (l *UpdateSysRoleLogic) UpdateSysRole(req *types.UpdateSysRoleReq) error {
+	if req.ParentId != 0 {
+		_, err := l.svcCtx.SysRoleModel.FindOne(l.ctx,req.ParentId)
+		if err != nil {
+			return errorx.NewDefaultError(errorx.ParentRoleIdErrorCode)
+		}
+	}
+
 	if req.Id == config.SysProtectRoleId {
 		return errorx.NewDefaultError(errorx.NotPermMenuErrorCode)
 	}

diff --git a/common/errorx/errormsg.go b/common/errorx/errormsg.go
@@ -40,6 +40,8 @@ const (
 	DeptIdErrorCode              = 1034
 	ProfessionIdErrorCode        = 1035
 	JobIdErrorCode               = 1036
+	ParentRoleIdErrorCode        = 1037
+	ParentDeptIdErrorCode        = 1038
 )
 
 func init() {
@@ -80,6 +82,8 @@ func init() {
 	errorMsg[DeptIdErrorCode] = "部门不存在"
 	errorMsg[ProfessionIdErrorCode] = "职称不存在"
 	errorMsg[JobIdErrorCode] = "岗位不存在"
+	errorMsg[ParentRoleIdErrorCode] = "父级角色不存在"
+	errorMsg[ParentDeptIdErrorCode] = "父级部门不存在"
 }
 
 func MapErrMsg(errCode int) string {