Merge branch 'dev_ic_diaodong' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop

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/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml

@@ -130,7 +130,7 @@
         LEFT JOIN ic_building_unit d on a.BUILDING_UNIT_ID = d.ID and d.DEL_FLAG = '0'
         <where>
             <if test="pids != null and pids != ''">
-                AND c.AGENCY_PIDS like CONCAT(#{pids},'%')
+                AND CONCAT(c.AGENCY_PIDS,':',c.AGENCY_ID) like CONCAT(#{pids},'%')
             </if>
             <if test="buildingId != null and buildingId.trim() != ''">
                 AND a.BUILDING_ID = #{buildingId}

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java

@@ -660,6 +660,7 @@ public class IcResiUserController {
         input.setCustomerId(loginUser.getCustomerId());
         input.setStaffId(loginUser.getUserId());
         input.setFormCode(IcFormCodeEnum.RESI_BASE_INFO.getCode());
+        input.setConditions(new ArrayList<>());
         if (input.getPageNo() == null) {
             input.setPageNo(NumConstant.ONE);
         }