Merge branch 'dev'

renren-admin/src/main/java/io/renren/common/aspect/ActivitiNoticeAspect.java

@@ -1,14 +1,12 @@
 package io.renren.common.aspect;
 
 import com.alibaba.fastjson.JSON;
-import com.google.common.collect.ImmutableMultimap;
 import io.renren.common.annotation.ActivitiNoticeOperation;
 import io.renren.modules.notice.dto.SysNoticeDTO;
 import io.renren.modules.notice.enums.NoticeStatusEnum;
 import io.renren.modules.notice.service.SysNoticeService;
 import io.renren.modules.processForm.dto.TAbilityApplicationDTO;
 import io.renren.modules.processForm.service.TAbilityApplicationService;
-import io.renren.modules.processForm.service.impl.TAbilityApplicationServiceImpl;
 import io.renren.modules.resource.service.ResourceService;
 import io.renren.modules.sys.dto.SysDeptDTO;
 import io.renren.modules.sys.dto.SysRoleDTO;
@@ -20,7 +18,6 @@ import org.activiti.engine.delegate.DelegateExecution;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.ExecutionListener;
 import org.activiti.engine.delegate.TaskListener;
-import org.apache.commons.collections.MultiMap;
 import org.apache.commons.lang3.StringUtils;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.After;

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

@@ -46,6 +46,7 @@ public interface TAbilityApplicationService extends CrudService<TAbilityApplicat
 
     /**
      * 查询部门申请的基础设施个数（审核中、通过）
+     *
      * @param deptId
      * @return
      */

renren-admin/src/main/resources/mapper/notice/SysNoticeDao.xml

@@ -11,7 +11,8 @@
 
     <!-- 获取我的通知列表 -->
     <select id="getMyNoticeList" resultType="io.renren.modules.notice.entity.SysNoticeEntity">
-        select t2.id, t2.title, t2.type, t2.sender_name, t2.sender_date, t1.read_status, t2.content ,t2.`from`, t2.apply_id, t2.apply_state from
+        select t2.id, t2.title, t2.type, t2.sender_name, t2.sender_date, t1.read_status, t2.content ,t2.`from`,
+        t2.apply_id, t2.apply_state from
         sys_notice_user t1, sys_notice t2
         where t1.notice_id = t2.id and t1.receiver_id = #{receiverId}
         <if test="readStatus != null">

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

@@ -1863,8 +1863,10 @@
 
     <select id="selectCollectResourceList" resultType="java.util.Map">
         SELECT tda.attr_value as type, count(*) as count FROM tb_data_resource tdr LEFT JOIN
-        (SELECT a.data_resource_id, a.id, a.attr_type, substring_index(substring_index(a.attr_value, ';', b.help_topic_id + 1), ';', - 1) AS attr_value
-        FROM tb_data_attr a INNER JOIN mysql.help_topic b ON a.attr_type='应用领域' AND a.del_flag=0 AND b.help_topic_id <![CDATA[ < ]]> (length(a.attr_value) - length(REPLACE(a.attr_value, ';', '')) + 1)) tda
+        (SELECT a.data_resource_id, a.id, a.attr_type, substring_index(substring_index(a.attr_value, ';',
+        b.help_topic_id + 1), ';', - 1) AS attr_value
+        FROM tb_data_attr a INNER JOIN mysql.help_topic b ON a.attr_type='应用领域' AND a.del_flag=0 AND b.help_topic_id
+        <![CDATA[ < ]]> (length(a.attr_value) - length(REPLACE(a.attr_value, ';', '')) + 1)) tda
         ON tdr.id=tda.data_resource_id
         WHERE 1=1 AND tdr.del_flag=0 AND tdr.type='应用资源'
         GROUP BY tda.attr_value

renren-admin/src/main/resources/public/diagram-viewer/index.html

@@ -127,6 +127,7 @@ $(document).ready(function(){
 
 
 
+
 </script>
 </body>
 </html>

renren-admin/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/index.html

@@ -56,6 +56,7 @@
 
 		})();
 
+
     </script>
 
 </head>

renren-admin/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/index.min.html

@@ -55,6 +55,7 @@
 
 		})();
 
+
     </script>
 
 </head>

renren-admin/src/main/resources/public/editor-app/renren-dialog/role.html

@@ -87,6 +87,7 @@ function getIds() {
 	return ids;
 }
 
+
 </script>
 </body>
 </html>

renren-admin/src/main/resources/public/editor-app/renren-dialog/user.html

@@ -88,6 +88,7 @@ function getIds() {
 	return ids;
 }
 
+
 </script>
 </body>
 </html>