From ca88bb7ab6510db8902b54ec88c9bd44b590f2a4 Mon Sep 17 00:00:00 2001
From: chenlin <chenlin@deovo.net>
Date: Tue, 27 May 2025 18:00:19 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96"=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=B8=A0=E9=81=93=E7=BC=96=E7=A0=81"?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=96=B0=E5=A2=9E=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?ID=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/apis/migumanage/migu_admin.go | 20 +++++---------------
 app/admin/models/migu.go                |  1 +
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/app/admin/apis/migumanage/migu_admin.go b/app/admin/apis/migumanage/migu_admin.go
index 5edaef4..c051f33 100644
--- a/app/admin/apis/migumanage/migu_admin.go
+++ b/app/admin/apis/migumanage/migu_admin.go
@@ -1859,21 +1859,11 @@ func (e MiGuDeployService) SysChannelList(c *gin.Context) {
 		return
 	}
 
-	// 4. 构建所有组合，并剔除重复的渠道编码
-	channelSet := make(map[string]struct{})
-
-	// 添加渠道表中的主渠道和子渠道编码
-	for _, channel := range mgChannels {
-		channelSet[channel.SubChannelCode] = struct{}{}
-	}
-
-	// 5. 转换为ChannelData结构体并分页
-	for code := range channelSet {
-		if code != "" { // 跳过空的channel_code
-			channels = append(channels, models.ChannelData{
-				ChannelCode: code,
-			})
-		}
+	for _, item := range mgChannels {
+		channels = append(channels, models.ChannelData{
+			ChannelCode: item.SubChannelCode,
+			ProductID:   item.ProductID,
+		})
 	}
 
 	// 总数
diff --git a/app/admin/models/migu.go b/app/admin/models/migu.go
index b8aed64..b1f063a 100644
--- a/app/admin/models/migu.go
+++ b/app/admin/models/migu.go
@@ -528,6 +528,7 @@ type SysChannelListResp struct {
 
 type ChannelData struct {
 	ChannelCode string `json:"channel_code"` // 渠道编码
+	ProductID   int    `json:"product_id"`   // 产品ID
 }
 
 // AddProductReq 添加新产品请求结构体