Browse Source

update 修改收藏图像返回字段

杨兴卓 1 month ago
parent
commit
4470b69486

+ 1 - 1
xyzc-start/src/main/java/com/xyzc/start/domain/vo/WebAppGroupVo.java

@@ -30,6 +30,6 @@ public class WebAppGroupVo {
     /**
      * 应用集合
      */
-    private List<AppPageVo> appList;
+    private List<AppPageVo> appPageList;
 
 }

+ 1 - 1
xyzc-start/src/main/java/com/xyzc/start/service/impl/AppPageServiceImpl.java

@@ -126,7 +126,7 @@ public class AppPageServiceImpl implements IAppPageService {
         AssertUtils.isEmpty(Collections.singleton(appVos), ErrorCode.NO_SELECT_DATA);
         // 封装返回
         WebAppGroupVo webAppGroupVo = new WebAppGroupVo();
-        webAppGroupVo.setAppList(appVos);
+        webAppGroupVo.setAppPageList(appVos);
         webAppGroupVo.setGroupName(appVos.get(0).getAppGroupName());
         webAppGroupVo.setGroupId(appVos.get(0).getAppGroupId());
 

+ 1 - 1
xyzc-start/src/main/resources/mapper/WebStart/BaseUserCollectMapper.xml

@@ -109,7 +109,7 @@
                  LEFT JOIN xy_draw_model xdm ON dg.model_id = xdm.id
                  LEFT JOIN sys_oss oss ON oss.oss_id = dg.oss_id
         WHERE xbuc.base_user_id = #{userId}
-          and xbuc.type = 2 AND dg.del_flag = '0'
+          and xbuc.type = 2  AND xbuc.is_collect = 1 AND  dg.del_flag = '0'
         <if test="name != null">
             and dg.title like concat('%',#{name},'%')
         </if>