v1.1

app/main/api/internal/logic/admin_role_api/adminassignroleapilogic.go

@@ -1,15 +1,16 @@
 package admin_role_api
 
 import (
-	"context"
+    "context"
 
-	"ycc-server/app/main/api/internal/svc"
-	"ycc-server/app/main/api/internal/types"
-	"ycc-server/app/main/model"
-	"ycc-server/common/xerr"
+    "ycc-server/app/main/api/internal/svc"
+    "ycc-server/app/main/api/internal/types"
+    "ycc-server/app/main/model"
+    "ycc-server/common/xerr"
 
-	"github.com/pkg/errors"
-	"github.com/zeromicro/go-zero/core/logx"
+    "github.com/pkg/errors"
+    "github.com/zeromicro/go-zero/core/logx"
+    "github.com/google/uuid"
 )
 
 type AdminAssignRoleApiLogic struct {
@@ -28,9 +29,9 @@ func NewAdminAssignRoleApiLogic(ctx context.Context, svcCtx *svc.ServiceContext)
 
 func (l *AdminAssignRoleApiLogic) AdminAssignRoleApi(req *types.AdminAssignRoleApiReq) (resp *types.AdminAssignRoleApiResp, err error) {
 	// 1. 参数验证
-	if req.RoleId <= 0 {
+	if req.RoleId == "" {
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.PARAM_VERIFICATION_ERROR),
-			"角色ID必须大于0, roleId: %d", req.RoleId)
+			"角色ID不能为空, roleId: %s", req.RoleId)
 	}
 	if len(req.ApiIds) == 0 {
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.PARAM_VERIFICATION_ERROR),
@@ -51,7 +52,7 @@ func (l *AdminAssignRoleApiLogic) AdminAssignRoleApi(req *types.AdminAssignRoleA
 	// 3. 批量分配API权限
 	successCount := 0
 	for _, apiId := range req.ApiIds {
-		if apiId <= 0 {
+		if apiId == "" {
 			continue
 		}
 
@@ -59,10 +60,10 @@ func (l *AdminAssignRoleApiLogic) AdminAssignRoleApi(req *types.AdminAssignRoleA
 		_, err := l.svcCtx.AdminApiModel.FindOne(l.ctx, apiId)
 		if err != nil {
 			if errors.Is(err, model.ErrNotFound) {
-				logx.Errorf("API不存在, apiId: %d", apiId)
+				logx.Errorf("API不存在, apiId: %s", apiId)
 				continue
 			}
-			logx.Errorf("查询API失败, err: %v, apiId: %d", err, apiId)
+			logx.Errorf("查询API失败, err: %v, apiId: %s", err, apiId)
 			continue
 		}
 
@@ -77,10 +78,11 @@ func (l *AdminAssignRoleApiLogic) AdminAssignRoleApi(req *types.AdminAssignRoleA
 		}
 
 		// 创建关联
-		roleApiData := &model.AdminRoleApi{
-			RoleId: req.RoleId,
-			ApiId:  apiId,
-		}
+        roleApiData := &model.AdminRoleApi{
+            Id:    uuid.NewString(),
+            RoleId: req.RoleId,
+            ApiId:  apiId,
+        }
 
 		_, err = l.svcCtx.AdminRoleApiModel.Insert(l.ctx, nil, roleApiData)
 		if err != nil {