能力广场和能力集市资源排序按指定方式排序修改

门户首页最新，最热查询排除知识库

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);
     }

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
+        ( CASE sd.type WHEN 1 THEN '省级' WHEN 2 THEN '市级' WHEN 3 THEN '区级' WHEN 4 THEN '企业' ELSE '其他' END ) AS "type",
-        "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
+        ( CASE sd.type WHEN 1 THEN '省级' WHEN 2 THEN '市级' WHEN 3 THEN '区级' WHEN 4 THEN '企业' ELSE '其他' END ) AS "type",
-        "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
+        ( CASE sd.type WHEN 1 THEN '省级' WHEN 2 THEN '市级' WHEN 3 THEN '区级' WHEN 4 THEN '企业' ELSE '其他' END ) AS "type",
-        "type",
         IFNULL( tdr.deptCount, 0) AS "deptCount",
         IFNULL(sr.name, '暂无该地区') AS "districtName"
         FROM
@@ -1526,6 +1522,7 @@
         SELECT
             tdr.id,
             tdr.`name`,
+            tdr.dept_id,
             sd.name AS "deptName",
             sd.sort AS "deptSort",
             sd.type AS "deptType",