Revert "update 完善添加管理员时角色id校验"

This reverts commit 66c039fed57ef437716eb5c9a3d77e12fe36e119.

game/config/data/codeConfig.json

@@ -29,6 +29,5 @@
   {"code":16014,"message":"admin-超级账户不能修改角色"},
   {"code":16015,"message":"token验证失败"},
   {"code":16016,"message":"Ip 禁用"},
-  {"code":16017,"message":"帐号不存在"},
-  {"code":16018,"message":"角色名称不存在"}
+  {"code":16017,"message":"帐号不存在"}
 ]

game/game_cluster/internal/code/code.go

@@ -50,5 +50,4 @@ var (
 	UnauthorizedError               int32 = 16015 // token验证失败
 	ForbiddenError                  int32 = 16016 // Ip 禁用
 	AccountNotExistError            int32 = 16017 // 帐号不存在
-	RoleNameNotExistError           int32 = 16018 // 角色名称不存在
 )

game/game_cluster/nodes/webadmin/service/admin.go

@@ -267,19 +267,9 @@ func (a *Admin) ChangePassword(ctx context.Context, username string, password st
 
 // Add 添加管理员
 func (a *Admin) Add(ctx context.Context, username string, password string, realName string, pid string, roleId string, status int) *code.Result {
-	// 验证角色名称是否已存在
-	exist, err := NewRole().CheckRoleNameExist(roleId)
-	if err != nil {
-		mhayaLogger.Warnf("Add CheckRoleNameExist error:%v", ctx.Err())
-		return common.NewResult(code.InternalError)
-	}
-	if !exist {
-		return common.NewResult(code.RoleNameNotExistError)
-	}
-
 	// 判断账号是否重复
 	admin := model.Admin{}
-	err = mdb.MDB.Collection(a.GetDBName()).FindOne(ctx, bson.M{"username": username}).Decode(&admin)
+	err := mdb.MDB.Collection(a.GetDBName()).FindOne(ctx, bson.M{"username": username}).Decode(&admin)
 	if errors.Is(err, mongo.ErrNoDocuments) {
 		newPassword, err := HashPassword(password)
 		if err != nil {

game/game_cluster/nodes/webadmin/service/role.go

@@ -95,13 +95,7 @@ func (r *Role) List(ctx context.Context, req entity.RoleListReq) (*entity.RoleRe
 // Add 新增角色
 func (r *Role) Add(ctx context.Context, req entity.RoleAddReq) *code.Result {
 	// 验证角色名称是否已存在
-	exist, err := r.CheckRoleNameExist(req.Name)
-	if err != nil {
-		mhayaLogger.Warnf("Add CheckRoleNameExist error:%v", ctx.Err())
-		return common.NewResult(code.InternalError)
-	}
-
-	if exist {
+	if !r.checkRoleNameExist(req.Name) {
 		return common.NewResult(code.RoleNameExistError)
 	}
 
@@ -161,8 +155,8 @@ func (r *Role) Update(ctx context.Context, req entity.RoleUpdateReq) *code.Resul
 	return nil
 }
 
-// CheckRoleNameExist 检查角色名称是否已存在
-func (r *Role) CheckRoleNameExist(name string) (bool, error) {
+// checkRoleNameExist 检查角色名称是否已存在
+func (r *Role) checkRoleNameExist(name string) bool {
 	// 创建带超时的上下文
 	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 	defer cancel()
@@ -173,17 +167,14 @@ func (r *Role) CheckRoleNameExist(name string) (bool, error) {
 	filter := bson.M{"name": name}
 
 	// 执行查询
-	err := collection.FindOne(ctx, filter).Err()
-	if err != nil {
+	if err := collection.FindOne(ctx, filter).Err(); err != nil {
 		if errors.Is(err, mongo.ErrNoDocuments) {
 			mhayaLogger.Warnf("No document found with role name: %s", name)
-			return false, nil
+			return true
 		}
-
-		return false, err
+		return false
 	}
-
-	return true, nil
+	return false
 }
 
 // Del 删除角色