修改excel导出为孔里表的bug

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/KeySiteMapper.xml

@@ -133,22 +133,22 @@
 		c.use_nature_name as useNatureName
 		FROM cb_key_site c
 		where c.is_delete = FALSE
-		<if test="name != null and name != ''">
+		<if test="name != null and name != '' and name != 'null'">
 			AND c.`name` like concat('%',#{name}, '%')
 		</if>
 		<if test="buildingId != null and buildingId != -1">
 			AND c.`building_id`= #{buildingId}
 		</if>
-		<if test="fireEnduranceRate != null and fireEnduranceRate != ''">
+		<if test="fireEnduranceRate != null and fireEnduranceRate != '' and fireEnduranceRate != 'null'">
 			AND c.`fire_endurance_rate`= #{fireEnduranceRate}
 		</if>
-		<if test="useNature != null and useNature != ''">
+		<if test="useNature != null and useNature != '' and useNature != 'null'">
 			AND c.`use_nature`= #{useNature}
 		</if>
-		<if test="fireFacilitiesInfo != null and fireFacilitiesInfo != ''">
+		<if test="fireFacilitiesInfo != null and fireFacilitiesInfo != '' and fireFacilitiesInfo != 'null' ">
 			AND c.`fire_facilities_info`= #{fireFacilitiesInfo}
 		</if>
-		<if test="bizOrgCode != null and bizOrgCode!=''">
+		<if test="bizOrgCode != null and bizOrgCode!='' and bizOrgCode!='null' ">
 			AND c.`biz_org_code` like concat(#{bizOrgCode}, '%')
 		</if>
 	</select>