java/zhihuishenqu.git

			@@ -18,13 +18,14 @@
			</resultMap>

			<select id="selectList" resultType="com.panzhihua.common.model.vos.property.ComPropertyAlarmVO">
			select t.*,t1.position,t1.longitude,t1.latitude,t2.name as solveName from com_property_alarm t
			select t.*,t3.address as position,t1.longitude,t1.latitude,t2.name as solveName from com_property_alarm t
			left join com_property_equipment t1 on t.serial_no = t1.serial_no
			left join com_mng_population_house t3 on t1.village_id=t3.id
			left join sys_user t2 on t.solve_id = user_id
			<where>
			1=1
			<if test="commonPage.paramId !=null">
			and t.community_id =#{commonPage.paramId}
			and t1.community_id =#{commonPage.paramId}
			</if>
			<if test="commonPage.type !=null">
			and t.type =#{commonPage.type}
			@@ -33,7 +34,7 @@
			and t.status =#{commonPage.status}
			</if>
			<if test="commonPage.address !=null and commonPage.address !=''">
			and t1.position like concat(#{commonPage.address},'%')
			and t3.address like concat(#{commonPage.address},'%')
			</if>
			<if test="commonPage.username !=null and commonPage.username !=''">
			and t.name like concat(#{commonPage.username},'%')