From 408baba4afba98affedec921f42ae81429b9b8d2 Mon Sep 17 00:00:00 2001
From: dinggang <2498628697@qq.com>
Date: Tue, 16 Aug 2022 10:26:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=83=BD=E5=8A=9B=E5=B9=BF=E5=9C=BA=E5=92=8C?=
 =?UTF-8?q?=E8=83=BD=E5=8A=9B=E9=9B=86=E5=B8=82=E8=B5=84=E6=BA=90=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E6=8C=89=E6=8C=87=E5=AE=9A=E6=96=B9=E5=BC=8F=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E4=BF=AE=E6=94=B9=20=E9=97=A8=E6=88=B7=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E6=9C=80=E6=96=B0=EF=BC=8C=E6=9C=80=E7=83=AD=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=8E=92=E9=99=A4=E7=9F=A5=E8=AF=86=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ResourceServiceImpl.java     |  7 +-
 .../resources/mapper/resource/ResourceDao.xml | 67 +++++++++----------
 2 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
index 4881761f..9ff0329b 100644
--- a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
+++ b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
@@ -683,7 +683,10 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
     public Object selectNewest(JSONObject jsonObject) {
         IPage<ResourceEntity> page = new Page<>(jsonObject.getIntValue("pageNum"), jsonObject.getIntValue("pageSize"));
         QueryWrapper<ResourceEntity> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(StringUtils.isNotBlank(jsonObject.getString("type")), "type", jsonObject.getString("type")).eq("del_flag", ResourceEntityDelFlag.NORMAL.getFlag()).orderByDesc("create_date");
+        queryWrapper.eq(StringUtils.isNotBlank(jsonObject.getString("type")), "type", jsonObject.getString("type"))
+                .eq("del_flag", ResourceEntityDelFlag.NORMAL.getFlag())
+                .ne("type", "知识库")
+                .orderByDesc("create_date");
         return resourceDao.selectPage(page, queryWrapper);
 
     }
@@ -1067,7 +1070,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
     }
 
     @Override
-    //@Cacheable(value = SELECT_DTO_PAGE_SPECIAL_TOTAL_KEY, key = "#p0")
+    @Cacheable(value = SELECT_DTO_PAGE_SPECIAL_TOTAL_KEY, key = "#p0")
     public List<Map> selectDTOPageSpecilTotal(ResourceDTO resourceDTO) {
         return resourceDao.selectDTOPageSpecilTotal(resourceDTO);
     }
diff --git a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
index e4bdd6ee..2ab328f7 100644
--- a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
+++ b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
@@ -106,6 +106,7 @@
         tdr.visitor,
         tdr.pin_top,
         tdr.pin_top_time,
+        tdr.dept_id,
         sd.type AS "deptType",
         sd.sort AS "deptSort",
         sr.sort AS "regionSort",
@@ -138,8 +139,7 @@
         AND user_id = #{dto.creator}
         GROUP BY id) taa2 ON tdr.id = taa2.resource_id
         LEFT JOIN ( SELECT resource_id, COUNT( approve_status ) approve_status FROM t_ability_application WHERE 1 = 1
-        AND del_flag = 0 AND user_id = #{dto.creator} AND approve_status = '通过' GROUP BY resource_id ) taa3 ON tdr.id
-        =
+        AND del_flag = 0 AND user_id = #{dto.creator} AND approve_status = '通过' GROUP BY resource_id ) taa3 ON tdr.id =
         taa3.resource_id
         LEFT JOIN sys_dept sd ON tdr.dept_id = sd.id
         LEFT JOIN sys_region sr ON sd.district = sr.id
@@ -271,12 +271,12 @@
         WHERE
         1 = 1
         AND tdr.del_flag = 0
+        AND  tdr.type != '知识库'
+        AND tdr.type != '赋能案例'
         <if test="type != null and type != ''">
-            <!-- AND tdr.type LIKE CONCAT('%',#{type},'%') -->
             AND MATCH (tdr.type) AGAINST ( #{type} IN BOOLEAN MODE)
         </if>
         <if test="name != null and name != ''">
-            <!--AND tdr.name LIKE CONCAT('%',#{name},'%') -->
             AND MATCH (tdr.name) AGAINST ( #{name} IN BOOLEAN MODE)
         </if>
         ORDER BY ${orderFiled} ${orderType}
@@ -424,8 +424,7 @@
         AND user_id = #{dto.creator}
         GROUP BY id) taa2 ON tdr.id = taa2.resource_id
         LEFT JOIN ( SELECT resource_id, COUNT( approve_status ) approve_status FROM t_ability_application WHERE 1 = 1
-        AND del_flag = 0 AND user_id = #{dto.creator} AND approve_status = '通过' GROUP BY resource_id ) taa3 ON tdr.id
-        =
+        AND del_flag = 0 AND user_id = #{dto.creator} AND approve_status = '通过' GROUP BY resource_id ) taa3 ON tdr.id =
         taa3.resource_id
         LEFT JOIN sys_dept sd ON tdr.dept_id = sd.id
         LEFT JOIN sys_region sr ON sd.district = sr.id
@@ -609,8 +608,7 @@
         FROM
         (
         SELECT
-        ( CASE sd.type WHEN 1 THEN '省级' WHEN 2 THEN '市级' WHEN 3 THEN '区级' WHEN 4 THEN '企业' ELSE '其他' END ) AS
-        "type",
+        ( CASE sd.type WHEN 1 THEN '省级' WHEN 2 THEN '市级' WHEN 3 THEN '区级' WHEN 4 THEN '企业' ELSE '其他' END ) AS "type",
         sd.NAME AS "deptName",
         IFNULL( tdr.deptCount, 0 ) AS "deptCount",
         sd.id AS "deptId",
@@ -625,7 +623,7 @@
         </if>
         GROUP BY dept_id ) tdr ON sd.id = tdr.dept_id
         LEFT JOIN sys_region sr ON sd.district = sr.id
-        ORDER BY sd.type, sd.sort
+        ORDER BY sd.type, sr.sort, sd.sort
         ) temp1
         WHERE
         1 = 1
@@ -644,8 +642,7 @@
         FROM
         (
         SELECT
-        ( CASE sd.type WHEN 1 THEN '省级' WHEN 2 THEN '市级' WHEN 3 THEN '区级' WHEN 4 THEN '企业' ELSE '其他' END ) AS
-        "type",
+        ( CASE sd.type WHEN 1 THEN '省级' WHEN 2 THEN '市级' WHEN 3 THEN '区级' WHEN 4 THEN '企业' ELSE '其他' END ) AS "type",
         IFNULL( tdr.deptCount, 0 ) AS "deptCount"
         FROM
         sys_dept sd
@@ -683,8 +680,7 @@
         FROM
         (
         SELECT
-        ( CASE sd.type WHEN 1 THEN '省级' WHEN 2 THEN '市级' WHEN 3 THEN '区级' WHEN 4 THEN '企业' ELSE '其他' END ) AS
-        "type",
+        ( CASE sd.type WHEN 1 THEN '省级' WHEN 2 THEN '市级' WHEN 3 THEN '区级' WHEN 4 THEN '企业' ELSE '其他' END ) AS "type",
         IFNULL( tdr.deptCount, 0) AS "deptCount",
         IFNULL(sr.name, '暂无该地区') AS "districtName"
         FROM
@@ -1514,7 +1510,7 @@
 
     <select id="resourceInstallationOrDataResourceDetails" parameterType="java.util.Map" resultType="java.util.Map">
         SELECT COUNT(a.id) AS resourceNum,a.dept_id AS deptId,b.name AS deptName
-        FROM tb_data_resource a INNER JOIN sys_dept b ON a.dept_id = b.id
+        FROM tb_data_resource a INNER JOIN  sys_dept b ON a.dept_id = b.id
         WHERE a.type = #{resourceType} AND a.del_flag = 0
         <if test="id != '0'.toString()">
             AND (b.ID = #{id} OR INSTR(b.pids,#{id}))
@@ -1524,39 +1520,40 @@
     </select>
     <select id="selectAppList" resultType="java.util.Map">
         SELECT
-        tdr.id,
-        tdr.`name`,
-        sd.name AS "deptName",
-        sd.sort AS "deptSort",
-        sd.type AS "deptType",
-        sr.sort AS "regionSort",
-        tdr.visitor
+            tdr.id,
+            tdr.`name`,
+            tdr.dept_id,
+            sd.name AS "deptName",
+            sd.sort AS "deptSort",
+            sd.type AS "deptType",
+            sr.sort AS "regionSort",
+            tdr.visitor
         FROM
-        tb_data_resource tdr
+            tb_data_resource tdr
         LEFT JOIN sys_dept sd ON tdr.dept_id = sd.id
         LEFT JOIN sys_region sr ON sd.district = sr.id
         WHERE
-        1 = 1
-        AND tdr.type = '应用资源'
-        AND tdr.del_flag = 0
-        <if test=" type != null and type != ''">
-            AND sd.type = #{type}
-        </if>
+            1 = 1
+          AND tdr.type = '应用资源'
+          AND tdr.del_flag = 0
+          <if test=" type != null and type != ''">
+              AND sd.type = #{type}
+          </if>
         ORDER BY
-        sd.type, sr.sort, sd.sort, tdr.dept_id, tdr.visitor DESC, tdr.id DESC
+            sd.type, sr.sort, sd.sort, tdr.dept_id, tdr.visitor DESC, tdr.id DESC
         LIMIT ${pageNum}, 9
 
     </select>
     <select id="selectPicByResId" resultType="java.lang.String">
         SELECT
-        tda.attr_value
+            tda.attr_value
         FROM
-        tb_data_attr tda
-        LEFT JOIN tb_data_resource tdr ON tda.data_resource_id = tdr.id
+            tb_data_attr tda
+                LEFT JOIN tb_data_resource tdr ON tda.data_resource_id = tdr.id
         WHERE
-        tda.attr_type = '应用图片'
-        AND tdr.id = #{id}
-        AND tda.del_flag = 0
+            tda.attr_type = '应用图片'
+            AND tdr.id = #{id}
+            AND tda.del_flag = 0
     </select>
     <select id="selectTypeCountByName" resultType="java.util.Map">
         SELECT