From eaf4a778dde19ac9acd932e31d1db53b0aa36cb9 Mon Sep 17 00:00:00 2001
From: Diyu0904 <1819728964@qq.com>
Date: Thu, 13 Mar 2025 16:36:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=91=E7=9A=84=E6=A8=A1?=
 =?UTF-8?q?=E5=9E=8B=E5=BA=93=E6=95=B0=E6=8D=AE=E8=BF=9E=E8=A1=A8=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=20=E6=A8=A1=E5=9E=8B=E5=B9=BF=E5=9C=BA=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E7=A9=BA=E7=89=88=E6=9C=AC=E6=95=B0=E6=8D=AE=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mcwl/resource/service/impl/ModelServiceImpl.java    | 6 ++++++
 .../src/main/resources/mapper/resource/CollectMapper.xml    | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelServiceImpl.java b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelServiceImpl.java
index 6ea5d7b..671a679 100644
--- a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelServiceImpl.java
+++ b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelServiceImpl.java
@@ -118,6 +118,12 @@ public class ModelServiceImpl extends ServiceImpl<ModelMapper,ModelProduct> impl
 
                 ModelVersion modelVersion = modelVersionMapper.selectByProductId(responseModelProduct.getId());
 
+                if (modelVersion == null){
+
+                    //跳出循环
+                    continue;
+                }
+
                 if (userIdMax == 0){
                     //收藏为空
                     modelVersion.setIsCollect(0);
diff --git a/mcwl-resource/src/main/resources/mapper/resource/CollectMapper.xml b/mcwl-resource/src/main/resources/mapper/resource/CollectMapper.xml
index 76538f8..cffeb1d 100644
--- a/mcwl-resource/src/main/resources/mapper/resource/CollectMapper.xml
+++ b/mcwl-resource/src/main/resources/mapper/resource/CollectMapper.xml
@@ -17,7 +17,7 @@
     </select>
 
     <select id="selectCollectWorkFlow" resultType="com.mcwl.resource.domain.response.ResponseCollect">
-        SELECT w.cover_path as file_path,v.file_name,w.workflow_name as product_name,u.nick_name,v.file_size,c.create_time
+        SELECT c.product_id as id,w.cover_path as file_path,v.file_name,w.workflow_name as product_name,u.nick_name,v.file_size,c.create_time
         FROM collect as c
                  LEFT JOIN work_flow_version as v on c.product_id = v.id
                  LEFT JOIN work_flow as w on  v.work_flow_id = w.id
@@ -26,7 +26,7 @@
     </select>
 
     <select id="selectCollectModel" resultType="com.mcwl.resource.domain.response.ResponseCollect">
-        SELECT m.surface_url as file_path,v.file_name,m.model_name as product_name,u.nick_name,v.file_size,c.create_time,v.model_version_type as type
+        SELECT 	c.product_id as id,m.surface_url as file_path,v.file_name,m.model_name as product_name,u.nick_name,v.file_size,c.create_time,v.model_version_type as type
         FROM collect as c
                  LEFT JOIN model_version as v on c.product_id = v.id
                  LEFT JOIN model as m on  v.model_id = m.id