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