|
@@ -44,8 +44,8 @@
|
|
|
<if test="unitAddress != null and unitAddress != ''">
|
|
<if test="unitAddress != null and unitAddress != ''">
|
|
|
AND eb.unit_address LIKE CONCAT('%',#{unitAddress},'%')
|
|
AND eb.unit_address LIKE CONCAT('%',#{unitAddress},'%')
|
|
|
</if>
|
|
</if>
|
|
|
- <if test="deptId != null and deptId != ''">
|
|
|
|
|
- AND eb.RELATION_DEPT = #{deptId}
|
|
|
|
|
|
|
+ <if test="relateDepartment != null and relateDepartment != ''">
|
|
|
|
|
+ AND eb.RELATION_DEPT = #{relateDepartment}
|
|
|
</if>
|
|
</if>
|
|
|
<if test="equipStreet != null and equipStreet.size() > 0">
|
|
<if test="equipStreet != null and equipStreet.size() > 0">
|
|
|
AND eb.equip_street IN
|
|
AND eb.equip_street IN
|
|
@@ -107,8 +107,8 @@
|
|
|
<if test="unitAddress != null and unitAddress != ''">
|
|
<if test="unitAddress != null and unitAddress != ''">
|
|
|
AND eb.unit_address LIKE CONCAT('%',#{unitAddress},'%')
|
|
AND eb.unit_address LIKE CONCAT('%',#{unitAddress},'%')
|
|
|
</if>
|
|
</if>
|
|
|
- <if test="deptId != null and deptId != ''">
|
|
|
|
|
- AND eb.RELATION_DEPT = #{deptId}
|
|
|
|
|
|
|
+ <if test="relateDepartment != null and relateDepartment != ''">
|
|
|
|
|
+ AND eb.RELATION_DEPT = #{relateDepartment}
|
|
|
</if>
|
|
</if>
|
|
|
<if test="equipStreet != null and equipStreet.size() > 0">
|
|
<if test="equipStreet != null and equipStreet.size() > 0">
|
|
|
AND eb.equip_street IN
|
|
AND eb.equip_street IN
|