|
@@ -32,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
LEFT JOIN adm_ems_facs fc ON f.obj_code = fc.facs_code AND f.obj_type = 2
|
|
|
LEFT JOIN adm_ems_device d ON f.obj_code = d.device_code AND f.obj_type = 3
|
|
|
<where>
|
|
|
- <if test="areaCode != null and areaCode != ''">and f.area_code = #{areaCode}</if>
|
|
|
+ <if test="areaCode != null and areaCode != '' and areaCode !='-1'">and f.area_code = #{areaCode}</if>
|
|
|
<if test="objCode != null and objCode != ''">and f.obj_code = #{objCode}</if>
|
|
|
<if test="objType != null ">and f.obj_type = #{objType}</if>
|
|
|
<if test="startRecTime != null and startRecTime != ''">and f.date >= #{startRecTime}</if>
|