修改bug

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/KeySiteServiceImpl.java

@@ -89,7 +89,7 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
 	public IPage<KeySiteDto> getPageList(Page<KeySiteDto> page, String name, Long buildingId, String fireEnduranceRate,
 			String useNature, String fireFacilitiesInfo, String bizOrgCode) {
 		List<Long> ids = null;
-		if (buildingId != null && buildingId.intValue() != 0) {
+		if (buildingId != null&& buildingId!=-1 && buildingId.intValue() != 0) {
 			ids = getNodeAllnodeIds(buildingId);
 		}
 		return keySiteMapper.getPageList(page, name, ids, fireEnduranceRate, useNature, fireFacilitiesInfo, bizOrgCode);

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificAlarmMapper.xml

@@ -945,7 +945,7 @@
                 month),'%y-%m') <!--上月-->
             </if>
 
-            <if test='dto.startDate != null and dto.endDate  != null '>
+            <if test='dto.startDate != null and dto.startDate != "" and dto.endDate  != null and dto.endDate != ""'>
                 AND DATE_FORMAT(wlesa.create_date, '%Y-%m-%d' ) <![CDATA[>=]]>  DATE_FORMAT(#{dto.startDate}, '%Y-%m-%d' )
                 AND DATE_FORMAT(wlesa.create_date, '%Y-%m-%d' ) <![CDATA[<=]]>  DATE_FORMAT(#{dto.endDate}, '%Y-%m-%d' )
             </if>