|
|
@@ -292,7 +292,7 @@
|
|
|
and a.corporate_name like concat('%',#{corporateName},'%')
|
|
|
</if>
|
|
|
<if test="mergeStatus != null">
|
|
|
- and merge_status = #{mergeStatus}
|
|
|
+ and a.merge_status = #{mergeStatus}
|
|
|
</if>
|
|
|
<if test="orderDeps != null">
|
|
|
and b.order_dep in
|
|
|
@@ -334,6 +334,9 @@
|
|
|
<if test="corporateName != null">
|
|
|
and a.corporate_name like concat('%',#{corporateName},'%')
|
|
|
</if>
|
|
|
+ <if test="mergeStatus != null">
|
|
|
+ and a.merge_status = #{mergeStatus}
|
|
|
+ </if>
|
|
|
<if test="orderDeps != null">
|
|
|
and b.order_dep in
|
|
|
<foreach close=")" collection="orderDeps" item="depId" open="(" separator=",">
|