|
|
@@ -486,13 +486,14 @@
|
|
|
</if>
|
|
|
where d.deleted_sign = 0 and d.data_category = 0
|
|
|
<if test="adminId != null">
|
|
|
- and u.mid = #{adminId,jdbcType=VARCHAR}
|
|
|
+ and (u.mid = #{adminId,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
<if test="adminId != null">
|
|
|
or d.principal_id = #{adminId,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
<if test="adminId != null">
|
|
|
or d.tech_broker_id = #{adminId,jdbcType=VARCHAR}
|
|
|
+ )
|
|
|
</if>
|
|
|
<if test="province != null">
|
|
|
and ui.province = #{province,jdbcType=INTEGER}
|
|
|
@@ -556,13 +557,14 @@
|
|
|
</if>
|
|
|
where d.deleted_sign = 0 and d.data_category = 0
|
|
|
<if test="adminId != null">
|
|
|
- and u.mid = #{adminId,jdbcType=VARCHAR}
|
|
|
+ and (u.mid = #{adminId,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
<if test="adminId != null">
|
|
|
or d.principal_id = #{adminId,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
<if test="adminId != null">
|
|
|
or d.tech_broker_id = #{adminId,jdbcType=VARCHAR}
|
|
|
+ )
|
|
|
</if>
|
|
|
<if test="serialNumber != null">
|
|
|
and d.serial_number = #{serialNumber,jdbcType=INTEGER}
|
|
|
@@ -628,13 +630,14 @@
|
|
|
</if>
|
|
|
where d.deleted_sign = 0 and d.data_category = 1
|
|
|
<if test="adminId != null">
|
|
|
- and u.mid = #{adminId,jdbcType=VARCHAR}
|
|
|
+ and (u.mid = #{adminId,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
<if test="adminId != null">
|
|
|
or d.principal_id = #{adminId,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
<if test="adminId != null">
|
|
|
or d.tech_broker_id = #{adminId,jdbcType=VARCHAR}
|
|
|
+ )
|
|
|
</if>
|
|
|
<if test="province != null">
|
|
|
and oi.licence_province = #{province,jdbcType=INTEGER}
|
|
|
@@ -698,13 +701,14 @@
|
|
|
</if>
|
|
|
where d.deleted_sign = 0 and d.data_category = 1
|
|
|
<if test="adminId != null">
|
|
|
- and u.mid = #{adminId,jdbcType=VARCHAR}
|
|
|
+ and (u.mid = #{adminId,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
<if test="adminId != null">
|
|
|
or d.principal_id = #{adminId,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
<if test="adminId != null">
|
|
|
or d.tech_broker_id = #{adminId,jdbcType=VARCHAR}
|
|
|
+ )
|
|
|
</if>
|
|
|
<if test="serialNumber != null">
|
|
|
and d.serial_number = #{serialNumber,jdbcType=INTEGER}
|