Merge branch 'master' into docker_package

# Conflicts:
#	renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java

renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java

@@ -805,6 +805,12 @@ public class TAbilityApplicationController {
             temp.put("system", index.getSystem());
             temp.put("resourceId", index.getResourceId());
             ResourceDTO resourceDTO = resourceService.get(Long.parseLong(index.getResourceId()));
+            try {
+                temp.put("resourceDept", sysDeptService.get(resourceDTO.getDeptId()).getName());
+            } catch (Exception exception) {
+                temp.put("resourceDept", "-");
+            }
+            temp.put("description", resourceDTO.getDescription());
             if ("应用资源".equals(resourceDTO.getType())) {
                 temp.put("resourceTYpe", "应用资源");
             } else if ("组件服务".equals(resourceDTO.getType())) {

renren-admin/src/main/java/io/renren/modules/processForm/service/impl/TAbilityApplicationServiceImpl.java

@@ -85,9 +85,9 @@ public class TAbilityApplicationServiceImpl extends CrudServiceImpl<TAbilityAppl
                     String sql = "SELECT 1 FROM tb_resource_score t1 WHERE t1.user_id = t_ability_application.user_id AND t1.resource_id = t_ability_application.resource_id";
                     String resource_sql = "SELECT 1 FROM tb_data_resource WHERE tb_data_resource.del_flag = 0 AND t_ability_application.resource_id = tb_data_resource.id";
                     if (score) {
-                        wrapper.exists(sql).exists(resource_sql).ne("approve_status", "不通过");
+                        wrapper.exists(sql).exists(resource_sql).eq("approve_status", "通过");
                     } else {
-                        wrapper.notExists(sql).exists(resource_sql).ne("approve_status", "不通过");
+                        wrapper.notExists(sql).exists(resource_sql).eq("approve_status", "通过");
                     }
                     break;
             }

renren-admin/src/main/resources/mapper/fuse/TbFuseDao.xml

@@ -33,7 +33,8 @@
         trc.user_id = #{userId})>0 , 'true', 'false') as isCollect
         FROM
         tb_fuse tf
-        LEFT JOIN ( SELECT id, resource_Id, user_id FROM tb_resource_collection WHERE 1 = 1 AND del_flag = 0 ) trc ON tf.id = trc.resource_id
+        LEFT JOIN ( SELECT id, resource_Id, user_id FROM tb_resource_collection WHERE 1 = 1 AND del_flag = 0 ) trc ON
+        tf.id = trc.resource_id
         WHERE
         1 =1
         <if test="name != null and name != ''">

renren-admin/src/main/resources/mapper/processForm/TAbilityApplicationDao.xml

@@ -345,14 +345,16 @@
         SELECT
         COUNT( 1 )
         FROM
-            ( SELECT id FROM t_ability_application WHERE user_id = #{userId} AND resource_id = #{resourceId} AND IFNULL( expire_date > #{today}, 1 ) > 0 ) temp
+        ( SELECT id FROM t_ability_application WHERE user_id = #{userId} AND resource_id = #{resourceId} AND IFNULL(
+        expire_date > #{today}, 1 ) > 0 ) temp
     </select>
 
     <select id="getFundStatement" resultType="java.util.Map">
         SELECT
         taa.id,
         tdr.NAME AS "resourceName",
-        ( CASE tdr.type WHEN '应用资源' THEN tdr.type WHEN '组件服务' THEN attr.attr_value ELSE tdr.type END ) AS "resourceType",
+        ( CASE tdr.type WHEN '应用资源' THEN tdr.type WHEN '组件服务' THEN attr.attr_value ELSE tdr.type END ) AS
+        "resourceType",
         sd.NAME AS "provideDept",
         taa.unit AS "applyDept",
         taa.create_date AS "applyDate",
@@ -362,7 +364,8 @@
         t_ability_application taa
         LEFT JOIN tb_data_resource tdr ON taa.resource_id = tdr.id
         LEFT JOIN sys_dept sd ON tdr.dept_id = sd.id
-        LEFT JOIN ( SELECT data_resource_id, attr_type, attr_value FROM tb_data_attr tda WHERE del_flag = 0 AND attr_type = '组件类型' ) attr ON tdr.id = attr.data_resource_id
+        LEFT JOIN ( SELECT data_resource_id, attr_type, attr_value FROM tb_data_attr tda WHERE del_flag = 0 AND
+        attr_type = '组件类型' ) attr ON tdr.id = attr.data_resource_id
         WHERE
         1 = 1
         AND tdr.del_flag = 0
@@ -394,7 +397,8 @@
             AND tdr.NAME LIKE CONCAT('%', #{params.resourceName} ,'%')
         </if>
         <if test="params.resourceType != null and params.resourceType != ''">
-            AND ( CASE tdr.type WHEN '应用资源' THEN tdr.type WHEN '组件服务' THEN attr.attr_value ELSE tdr.type END ) = #{params.resourceType}
+            AND ( CASE tdr.type WHEN '应用资源' THEN tdr.type WHEN '组件服务' THEN attr.attr_value ELSE tdr.type END ) =
+            #{params.resourceType}
         </if>
 
         UNION ALL
@@ -453,7 +457,8 @@
         t_ability_application taa
         LEFT JOIN tb_data_resource tdr ON taa.resource_id = tdr.id
         LEFT JOIN sys_dept sd ON tdr.dept_id = sd.id
-        LEFT JOIN ( SELECT data_resource_id, attr_type, attr_value FROM tb_data_attr tda WHERE del_flag = 0 AND attr_type = '组件类型' ) attr ON tdr.id = attr.data_resource_id
+        LEFT JOIN ( SELECT data_resource_id, attr_type, attr_value FROM tb_data_attr tda WHERE del_flag = 0 AND
+        attr_type = '组件类型' ) attr ON tdr.id = attr.data_resource_id
         WHERE
         1 = 1
         AND tdr.del_flag = 0
@@ -485,7 +490,8 @@
             AND tdr.NAME LIKE CONCAT('%', #{params.resourceName} ,'%')
         </if>
         <if test="params.resourceType != null and params.resourceType != ''">
-            AND ( CASE tdr.type WHEN '应用资源' THEN tdr.type WHEN '组件服务' THEN attr.attr_value ELSE tdr.type END ) = #{params.resourceType}
+            AND ( CASE tdr.type WHEN '应用资源' THEN tdr.type WHEN '组件服务' THEN attr.attr_value ELSE tdr.type END ) =
+            #{params.resourceType}
         </if>
 
         UNION ALL
@@ -532,7 +538,8 @@
         SELECT
         taa.id,
         tdr.NAME AS "resourceName",
-        ( CASE tdr.type WHEN '应用资源' THEN tdr.type WHEN '组件服务' THEN attr.attr_value ELSE tdr.type END ) AS "resourceType",
+        ( CASE tdr.type WHEN '应用资源' THEN tdr.type WHEN '组件服务' THEN attr.attr_value ELSE tdr.type END ) AS
+        "resourceType",
         sd.NAME AS "provideDept",
         taa.unit AS "applyDept",
         date_format(taa.create_date, "%Y-%m-%d %h:%i:%s") AS "applyDate",
@@ -542,7 +549,8 @@
         t_ability_application taa
         LEFT JOIN tb_data_resource tdr ON taa.resource_id = tdr.id
         LEFT JOIN sys_dept sd ON tdr.dept_id = sd.id
-        LEFT JOIN ( SELECT data_resource_id, attr_type, attr_value FROM tb_data_attr tda WHERE del_flag = 0 AND attr_type = '组件类型' ) attr ON tdr.id = attr.data_resource_id
+        LEFT JOIN ( SELECT data_resource_id, attr_type, attr_value FROM tb_data_attr tda WHERE del_flag = 0 AND
+        attr_type = '组件类型' ) attr ON tdr.id = attr.data_resource_id
         WHERE
         1 = 1
         AND tdr.del_flag = 0
@@ -574,7 +582,8 @@
             AND tdr.NAME LIKE CONCAT('%', #{params.resourceName} ,'%')
         </if>
         <if test="params.resourceType != null and params.resourceType != ''">
-            AND ( CASE tdr.type WHEN '应用资源' THEN tdr.type WHEN '组件服务' THEN attr.attr_value ELSE tdr.type END ) = #{params.resourceType}
+            AND ( CASE tdr.type WHEN '应用资源' THEN tdr.type WHEN '组件服务' THEN attr.attr_value ELSE tdr.type END ) =
+            #{params.resourceType}
         </if>
 
         UNION ALL
@@ -633,7 +642,8 @@
         t_ability_application taa
         LEFT JOIN tb_data_resource tdr ON taa.resource_id = tdr.id
         LEFT JOIN sys_dept sd ON tdr.dept_id = sd.id
-        LEFT JOIN ( SELECT data_resource_id, attr_type, attr_value FROM tb_data_attr tda WHERE del_flag = 0 AND attr_type = '组件类型' ) attr ON tdr.id = attr.data_resource_id
+        LEFT JOIN ( SELECT data_resource_id, attr_type, attr_value FROM tb_data_attr tda WHERE del_flag = 0 AND
+        attr_type = '组件类型' ) attr ON tdr.id = attr.data_resource_id
         WHERE
         1 = 1
         AND tdr.del_flag = 0
@@ -665,7 +675,8 @@
             AND tdr.NAME LIKE CONCAT('%', #{params.resourceName} ,'%')
         </if>
         <if test="params.resourceType != null and params.resourceType != ''">
-            AND ( CASE tdr.type WHEN '应用资源' THEN tdr.type WHEN '组件服务' THEN attr.attr_value ELSE tdr.type END ) = #{params.resourceType}
+            AND ( CASE tdr.type WHEN '应用资源' THEN tdr.type WHEN '组件服务' THEN attr.attr_value ELSE tdr.type END ) =
+            #{params.resourceType}
         </if>
 
         UNION ALL
@@ -982,9 +993,11 @@
         ( SELECT id, NAME, sort FROM sys_region WHERE tree_level = 3 AND 9 >= sort ) srg
         LEFT JOIN sys_dept sd ON sd.district = srg.id
         LEFT JOIN tb_data_resource tdr ON tdr.dept_id = sd.id
-                    LEFT JOIN (SELECT resource_id, SUM(apply_price) AS "apply_price", COUNT(id) AS "applyCount" FROM t_ability_application taa WHERE
+        LEFT JOIN (SELECT resource_id, SUM(apply_price) AS "apply_price", COUNT(id) AS "applyCount" FROM
+        t_ability_application taa WHERE
         taa.del_flag = 0
-                                                                                                                                                 AND taa.approve_status = '通过' AND (taa.camera_list IS NULL OR taa.camera_list = '') GROUP BY resource_id ) taa ON taa.resource_id = tdr.id
+        AND taa.approve_status = '通过' AND (taa.camera_list IS NULL OR taa.camera_list = '') GROUP BY resource_id ) taa
+        ON taa.resource_id = tdr.id
         GROUP BY
         srg.id
         ORDER BY srg.sort

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

@@ -2116,7 +2116,8 @@
         tb_data_attr a
         INNER JOIN mysql.help_topic b ON a.attr_type = '应用领域'
         AND a.del_flag = 0
-        AND b.help_topic_id < ( length( a.attr_value ) - length( REPLACE ( a.attr_value, ';', '' )) + 1 )) tda ON tdr.id = tda.data_resource_id
+        AND b.help_topic_id < ( length( a.attr_value ) - length( REPLACE ( a.attr_value, ';', '' )) + 1 )) tda ON
+        tdr.id = tda.data_resource_id
         LEFT JOIN (
         SELECT
         sdd.sort,
@@ -2400,7 +2401,8 @@
         AND tdr.id IN
         <foreach collection="resourceIds" item="id" open="(" separator="," close=")">
             #{id}
-              </foreach> UNION ALL
+        </foreach>
+        UNION ALL
         SELECT DISTINCT
         tda.attr_value
         FROM

renren-admin/src/main/resources/mapper/sysnoticemanagement/SysNoticeManagementDao.xml

@@ -3,7 +3,8 @@
 
 <mapper namespace="io.renren.modules.sysnoticemanagement.dao.SysNoticeManagementDao">
 
-    <resultMap type="io.renren.modules.sysnoticemanagement.entity.SysNoticeManagementEntity" id="sysNoticeManagementMap">
+    <resultMap type="io.renren.modules.sysnoticemanagement.entity.SysNoticeManagementEntity"
+               id="sysNoticeManagementMap">
         <result property="id" column="id"/>
         <result property="content" column="content"/>
         <result property="publishTime" column="publish_time"/>