修复了用户组和用户名唯一判断错误的问题

server/api/user.go

@@ -62,9 +62,8 @@ func (userApi UserApi) UserUpdateEndpoint(c echo.Context) error {
 	if err := c.Bind(&item); err != nil {
 		return err
 	}
-	item.ID = id
 
-	if err := repository.UserRepository.Update(context.TODO(), &item); err != nil {
+	if err := service.UserService.UpdateUser(id, item); err != nil {
 		return err
 	}
 

server/repository/user.go

@@ -78,14 +78,17 @@ func (r userRepository) FindByUsername(c context.Context, username string) (o mo
 	return
 }
 
-func (r userRepository) ExistByUsername(c context.Context, username string) (exist bool) {
+func (r userRepository) ExistByUsername(c context.Context, username string) (exist bool, err error) {
-	count := int64(0)
+	user := model.User{}
-	err := r.GetDB(c).Table("users").Where("username = ?", username).Count(&count).Error
+	var count uint64
+	err = r.GetDB(c).Table(user.TableName()).Select("count(*)").
+		Where("username = ?", username).
+		Find(&count).
+		Error
 	if err != nil {
-		return false
+		return false, err
 	}
-
+	return count > 0, nil
-	return count > 0
 }
 
 func (r userRepository) FindOnlineUsers(c context.Context) (o []model.User, err error) {

server/repository/user_group.go

@@ -57,6 +57,19 @@ func (r userGroupRepository) FindByName(c context.Context, name string) (o model
 	return
 }
 
+func (r userGroupRepository) ExistByName(ctx context.Context, name string) (exists bool, err error) {
+	userGroup := model.UserGroup{}
+	var count uint64
+	err = r.GetDB(ctx).Table(userGroup.TableName()).Select("count(*)").
+		Where("name = ?", name).
+		Find(&count).
+		Error
+	if err != nil {
+		return false, err
+	}
+	return count > 0, nil
+}
+
 func (r userGroupRepository) Create(c context.Context, o *model.UserGroup) (err error) {
 	return r.GetDB(c).Create(o).Error
 }

server/service/backup.go

@@ -133,7 +133,11 @@ func (service backupService) Import(backup *dto.Backup) error {
 		if len(backup.Users) > 0 {
 			for _, item := range backup.Users {
 				oldId := item.ID
-				if repository.UserRepository.ExistByUsername(c, item.Username) {
+				exist, err := repository.UserRepository.ExistByUsername(c, item.Username)
+				if err != nil {
+					return err
+				}
+				if exist {
 					delete(userIdMapping, oldId)
 					continue
 				}

server/service/user.go

@@ -209,7 +209,11 @@ func (service userService) ReloadToken() error {
 func (service userService) CreateUser(user model.User) (err error) {
 	return env.GetDB().Transaction(func(tx *gorm.DB) error {
 		c := service.Context(tx)
-		if repository.UserRepository.ExistByUsername(c, user.Username) {
+		exist, err := repository.UserRepository.ExistByUsername(c, user.Username)
+		if err != nil {
+			return err
+		}
+		if exist {
 			return fmt.Errorf("username %s is already used", user.Username)
 		}
 		password := user.Password
@@ -307,3 +311,29 @@ func (service userService) SaveLoginLog(clientIP, clientUserAgent string, userna
 func (service userService) DeleteALlLdapUser(ctx context.Context) error {
 	return repository.UserRepository.DeleteBySource(ctx, constant.SourceLdap)
 }
+
+func (service userService) UpdateUser(id string, user model.User) error {
+
+	return env.GetDB().Transaction(func(tx *gorm.DB) error {
+		ctx := service.Context(tx)
+
+		dbUser, err := repository.UserRepository.FindById(ctx, id)
+		if err != nil {
+			return err
+		}
+
+		if dbUser.Username != user.Username {
+			// 修改了登录账号
+			exist, err := repository.UserRepository.ExistByUsername(ctx, user.Username)
+			if err != nil {
+				return err
+			}
+			if exist {
+				return fmt.Errorf("username %s is already used", user.Username)
+			}
+		}
+
+		return repository.UserRepository.Update(ctx, &user)
+	})
+
+}

server/service/user_group.go

@@ -2,7 +2,6 @@ package service
 
 import (
 	"context"
-	"errors"
 
 	"next-terminal/server/constant"
 	"next-terminal/server/env"
@@ -36,14 +35,13 @@ func (service userGroupService) DeleteById(userGroupId string) error {
 }
 
 func (service userGroupService) Create(name string, members []string) (model.UserGroup, error) {
-	var err error
+	exist, err := repository.UserGroupRepository.ExistByName(context.TODO(), name)
-	_, err = repository.UserGroupRepository.FindByName(context.TODO(), name)
+	if err != nil {
-	if err == nil {
+		return model.UserGroup{}, err
-		return model.UserGroup{}, constant.ErrNameAlreadyUsed
 	}
 
-	if !errors.Is(gorm.ErrRecordNotFound, err) {
+	if exist {
-		return model.UserGroup{}, err
+		return model.UserGroup{}, constant.ErrNameAlreadyUsed
 	}
 
 	userGroupId := utils.UUID()
@@ -76,15 +74,21 @@ func (service userGroupService) Create(name string, members []string) (model.Use
 }
 
 func (service userGroupService) Update(userGroupId string, name string, members []string) (err error) {
-	var userGroup model.UserGroup
+	dbUserGroup, err := repository.UserGroupRepository.FindById(context.TODO(), userGroupId)
-	userGroup, err = repository.UserGroupRepository.FindByName(context.TODO(), name)
+	if err != nil {
-	if err == nil && userGroup.ID != userGroupId {
-		return constant.ErrNameAlreadyUsed
-	}
-
-	if errors.Is(gorm.ErrRecordNotFound, err) {
 		return err
 	}
+	if dbUserGroup.Name != name {
+		// 修改了名称
+		exist, err := repository.UserGroupRepository.ExistByName(context.TODO(), name)
+		if err != nil {
+			return err
+		}
+
+		if exist {
+			return constant.ErrNameAlreadyUsed
+		}
+	}
 
 	return env.GetDB().Transaction(func(tx *gorm.DB) error {
 		c := context.WithValue(context.TODO(), constant.DB, tx)