From 872e028e0d69ce2d6fd20fb220277fb9cd1321b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E4=BF=8A=E6=88=90?= <gakkiismywife1@163.com>
Date: Tue, 17 Oct 2023 15:41:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/apis/basic/category.go |  2 +-
 app/admin/models/category.go     | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/admin/apis/basic/category.go b/app/admin/apis/basic/category.go
index ed89b67..90d2cdd 100644
--- a/app/admin/apis/basic/category.go
+++ b/app/admin/apis/basic/category.go
@@ -12,7 +12,7 @@ import (
 
 type CreateCategoryRequest struct {
 	Name     string `json:"name" validate:"required"` //名称
-	ParentId string `json:"parent_id"`                //父分类编号
+	ParentId uint32 `json:"parent_id"`                //父分类id
 }
 
 // CreateCategory 创建分类
diff --git a/app/admin/models/category.go b/app/admin/models/category.go
index 37e2ede..85fb64c 100644
--- a/app/admin/models/category.go
+++ b/app/admin/models/category.go
@@ -12,7 +12,7 @@ type Category struct {
 	Name                  string `json:"name"`                    // 分类名称
 	Number                string `json:"number"`                  //编号
 	Display               int8   `json:"state"`                   // 1 展示 0 隐藏
-	Pid                   string `json:"pid" gorm:"index"`        //父分类的编号
+	Pid                   uint32 `json:"pid" gorm:"index"`        //父分类的编号
 	CooperativeBusinessId uint32 `json:"cooperative_business_id"` //合作商id
 }
 
@@ -24,11 +24,13 @@ func (c *Category) BeforeCreate(tx *gorm.DB) error {
 	if c.Number == "" {
 		var count int64
 		var err error
-		if c.Pid == "" {
+		if c.Pid == 0 {
 			err = tx.Model(c).
+				Unscoped().
 				Scopes(common.ScopeCooperativeBusiness(c.CooperativeBusinessId)).
 				Where("pid", "").
-				Count(&count).Error
+				Count(&count).
+				Error
 			if err != nil {
 				return err
 			}
@@ -37,12 +39,13 @@ func (c *Category) BeforeCreate(tx *gorm.DB) error {
 			var parent Category
 			err = tx.
 				Scopes(common.ScopeCooperativeBusiness(c.CooperativeBusinessId)).
-				Where("number", c.Pid).
+				Where("id", c.Pid).
 				First(&parent).Error
 			if err != nil {
 				return err
 			}
 			err = tx.Model(c).
+				Unscoped().
 				Scopes(common.ScopeCooperativeBusiness(c.CooperativeBusinessId)).
 				Where("pid", c.Pid).
 				Count(&count).