Merge branch 'master' into dev

renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java

@@ -389,7 +389,18 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
         Integer pageNum = jsonObject.getInteger("pageNum");
         Integer pageSize = jsonObject.getInteger("pageSize");
         //默认按上架时间降序排列
-        String orderField = StringUtils.isBlank(jsonObject.getString("orderField")) ? "total" : jsonObject.getString("orderField");
+        String orderField;
+        if (StringUtils.isBlank(jsonObject.getString("orderField"))) {
+            if ("应用资源".equals(jsonObject.getString("type"))) {
+                orderField = "deptSort";
+            } else if ("组件服务".equals(jsonObject.getString("type"))) {
+                orderField = "pin_top";
+            } else {
+                orderField = "total";
+            }
+        } else {
+            orderField = jsonObject.getString("orderField");
+        }
         String orderType = StringUtils.isBlank(jsonObject.getString("orderType")) ? "DESC" : jsonObject.getString("orderType");
         Page<ResourceDTO> resultPage = new Page<>(pageNum, pageSize);
         switch (Constant.ProjectPlace.getByFlag(projectPlace)) {

renren-admin/src/main/resources/mapper/resource/ResourceDao.xml

@@ -132,8 +132,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
         WHERE 1 = 1
@@ -188,10 +187,13 @@
             )
         </if>
         <if test="orderField != null and orderField !=''">
-            ORDER BY ${orderField} ${orderType}
             <if test="orderField == 'pin_top'">
-                , pin_top_time DESC
+                ORDER BY ${orderField} ${orderType}, pin_top_time DESC
             </if>
+            <if test="orderField == 'deptSort'">
+                ORDER BY sd.type, sd.sort
+            </if>
+            ORDER BY ${orderField} ${orderType}
         </if>
     </select>
 
@@ -405,8 +407,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
         WHERE 1 = 1
@@ -451,10 +452,13 @@
             </foreach>
         </if>
         <if test="orderField != null and orderField !=''">
-            ORDER BY ${orderField} ${orderType}
             <if test="orderField == 'pin_top'">
-                , pin_top_time DESC
+                ORDER BY ${orderField} ${orderType}, pin_top_time DESC
             </if>
+            <if test="orderField == 'deptSort'">
+                ORDER BY sd.type, sd.sort
+            </if>
+            ORDER BY ${orderField} ${orderType}
             LIMIT ${pageNum}, ${pageSize}
         </if>
     </select>
@@ -582,8 +586,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",
@@ -614,8 +617,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
@@ -653,8 +655,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
@@ -1484,7 +1485,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}))
@@ -1494,33 +1495,33 @@
     </select>
     <select id="selectAppList" resultType="java.util.Map">
         SELECT
-        tdr.id,
+            tdr.id,
-        tdr.`name`,
+            tdr.`name`,
-        sd.name AS "deptName"
+            sd.name AS "deptName"
         FROM
-        tb_data_resource tdr
+            tb_data_resource tdr
         LEFT JOIN sys_dept sd ON tdr.dept_id = sd.id
         WHERE
-        1 = 1
+            1 = 1
-        AND tdr.type = '应用资源'
+          AND tdr.type = '应用资源'
-        AND tdr.del_flag = 0
+          AND tdr.del_flag = 0
-        <if test=" type != null and type != ''">
+          <if test=" type != null and type != ''">
-            AND sd.type = #{type}
+              AND sd.type = #{type}
-        </if>
+          </if>
         ORDER BY
-        tdr.visitor
+            tdr.visitor
         LIMIT ${pageNum}, 9
 
     </select>
     <select id="selectPicByResId" resultType="java.lang.String">
         SELECT
-        tda.attr_value
+            tda.attr_value
         FROM
-        tb_data_attr tda
+            tb_data_attr tda
-        LEFT JOIN tb_data_resource tdr ON tda.data_resource_id = tdr.id
+                LEFT JOIN tb_data_resource tdr ON tda.data_resource_id = tdr.id
         WHERE
-        tda.attr_type = '应用图片'
+            tda.attr_type = '应用图片'
-        AND tdr.id = #{id}
+            AND tdr.id = #{id}
-        AND tda.del_flag = 0
+            AND tda.del_flag = 0
     </select>
 </mapper>