Merge branch 'dev_bug_sb_syc' into shibei_master

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java

@@ -48,6 +48,10 @@ public class LogMsgSendFilter extends LevelFilter {
         if (event.getLevel().isGreaterOrEqual(Level.ERROR)) {
             try {
                 getServerInfo();
+                if (EnvEnum.LOCAL.getName().equals(activeEnv)){
+                    //交给其他filter继续向下处理
+                    return super.decide(event);
+                }
 
                 StringBuilder stringBuilder = new StringBuilder();
                 stringBuilder.append("【日志告警】\n");
@@ -62,7 +66,6 @@ public class LogMsgSendFilter extends LevelFilter {
                 }
 
                 if (StringUtils.isNotBlank(activeEnv)) {
-                    stringBuilder.append("告警环境：").append(activeEnv);
                     stringBuilder.append("\n");
                 }
 
@@ -109,6 +112,7 @@ public class LogMsgSendFilter extends LevelFilter {
                 if (!flag) {
                     logger.warn("msgSender.sendMsg fail,param：{}", stringBuilder.toString());
                 }
+                stringBuilder.append("告警环境：").append(activeEnv);
             } catch (Exception e) {
                 logger.warn("decide exception", e);
             }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java

@@ -1,6 +1,7 @@
 package com.epmet.dataaggre.service.govproject.impl;
 
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+import com.epmet.commons.tools.constant.CustomerIdConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
@@ -682,7 +683,7 @@ public class GovProjectServiceImpl implements GovProjectService {
 		})).collect(Collectors.toList());
 
 		//4.根据userId集合和二级分类Code集合查询来源楼院小组的项目
-		List<ProjectCategoryResultDTO> groupList = projectDao.getProjectCategoryList(formDTO.getCustomerId(), secondCodeList, userIds, "issue");
+		List<ProjectCategoryResultDTO> groupList = projectDao.getProjectCategoryList(formDTO.getCustomerId(), (CustomerIdConstant.SHI_BEI_CUSTOMER_ID.equals(formDTO.getCustomerId()) ? null : secondCodeList), userIds, "issue");
 
 		//5.根据userId集合和二级分类Code集合查询来源事件上报的项目
 		List<ProjectCategoryResultDTO> eventList = projectDao.getProjectCategoryList(formDTO.getCustomerId(), secondCodeList, userIds, "resiEvent");

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml

@@ -370,9 +370,18 @@
             p.del_flag = '0'
         AND p.customer_id = #{customerId}
         AND p.origin = #{origin}
+        <choose>
+            <when test="null != secondCodeList and secondCodeList.size > 0">
                 <foreach collection="secondCodeList" item="code" open="AND pc.category_code IN (" separator="," close=")">
                     #{code}
                 </foreach>
+            </when>
+            <otherwise>
+                <foreach collection="secondCodeList" item="code" open="AND (" separator=" OR "  close=" )" >
+                    pc.category_code LIKE CONCAT(#{code}, '%')
+                </foreach>
+            </otherwise>
+        </choose>
         <if test="origin != null and origin != '' and origin == 'issue'">
             <foreach collection="userIds" item="userId" open="AND prp.user_id IN (" separator="," close=")">
                 #{userId}