From c767ee58463843547f9d344d5017652236a35319 Mon Sep 17 00:00:00 2001
From: dinggang <2498628697@qq.com>
Date: Wed, 28 Dec 2022 09:54:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8F=E8=A7=88=E8=AE=B0=E5=BD=95=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E9=94=99=E8=AF=AF=E5=8F=8A=E6=8C=89=E8=83=BD=E5=8A=9B?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=9F=A5=E8=AF=A2=E5=A4=B1=E6=95=88=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ResourceBrowseServiceImpl.java       |  4 ++--
 .../resourceBrowse/ResourceBrowseDao.xml      | 19 ++++++-------------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/renren-admin/src/main/java/io/renren/modules/resourceBrowse/service/impl/ResourceBrowseServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/resourceBrowse/service/impl/ResourceBrowseServiceImpl.java
index 66f72034..a099f567 100644
--- a/renren-admin/src/main/java/io/renren/modules/resourceBrowse/service/impl/ResourceBrowseServiceImpl.java
+++ b/renren-admin/src/main/java/io/renren/modules/resourceBrowse/service/impl/ResourceBrowseServiceImpl.java
@@ -81,11 +81,11 @@ public class ResourceBrowseServiceImpl extends CrudServiceImpl<ResourceBrowseDao
     @Override
     public PageData<ResourceBrowseDTO> selectResourceBrowseByTypeAndUser(Map<String, Object> map) {
         List<ResourceBrowseDTO> list = resourceBrowseDao.selectResourceBrowseByTypeAndUser(map);
-        list = list.stream()
+        List<ResourceBrowseDTO> collect = list.stream()
                 .skip(Long.valueOf(map.get("pageNum").toString()))
                 .limit(Long.valueOf(map.get("pageSize").toString()))
                 .collect(Collectors.toList());
-        PageData<ResourceBrowseDTO> pageData = new PageData<ResourceBrowseDTO>(list, list.size());
+        PageData<ResourceBrowseDTO> pageData = new PageData<ResourceBrowseDTO>(collect, list.size());
         return pageData;
     }
 }
\ No newline at end of file
diff --git a/renren-admin/src/main/resources/mapper/resourceBrowse/ResourceBrowseDao.xml b/renren-admin/src/main/resources/mapper/resourceBrowse/ResourceBrowseDao.xml
index 427df15a..0ff91795 100644
--- a/renren-admin/src/main/resources/mapper/resourceBrowse/ResourceBrowseDao.xml
+++ b/renren-admin/src/main/resources/mapper/resourceBrowse/ResourceBrowseDao.xml
@@ -54,20 +54,13 @@
 
     <select id="selectResourceBrowseByTypeAndUser" parameterType="java.util.Map"
             resultType="io.renren.modules.resourceBrowse.dto.ResourceBrowseDTO">
-        SELECT a.*, c.attr_value FROM tb_resource_browse a INNER JOIN tb_data_resource b ON a.resource_id = b.id
-                   LEFT JOIN tb_data_attr c ON b.id = c.data_resource_id
-        WHERE a.state = 0
-          AND c.del_flag = 0
-          AND c.attr_type = '组件类型'
+        SELECT a.*, b.type FROM tb_resource_browse a INNER JOIN tb_data_resource b ON a.resource_id = b.id
+        WHERE a.state = 0 AND b.del_flag != 1
         <if test="params.type != null and params.type != ''">
-            <choose>
-                <when test="params.type == '应用资源' or params.type == '知识库'">
-                    AND b.type = #{params.type}
-                </when>
-                <otherwise>
-                    AND c.attr_value = #{params.type}
-                </otherwise>
-            </choose>
+            AND b.type = #{params.type}
+        </if>
+        <if test="params.userId != null and params.userId != ''">
+            AND a.user_id = #{params.userId}
         </if>
         <if test="params.name != null and params.name != ''">
             AND (b.name LIKE(CONCAT('%',CONCAT(trim(#{params.name}),'%'))) OR b.type