|
|
@@ -98,13 +98,12 @@
|
|
|
<if test="mergeId!=null and mergeId!=''">
|
|
|
and menu.merge_id = #{mergeId}
|
|
|
</if>
|
|
|
- <if test="mergeFlag!=null">
|
|
|
- <if test="mergeFlag=1">
|
|
|
- and menu.merge_id !=null
|
|
|
- </if>
|
|
|
- <if test="mergeFlag=0">
|
|
|
- and menu.merge_id =null
|
|
|
- </if>
|
|
|
+ <if test="mergeFlag!=null and mergeFlag==1">
|
|
|
+ and menu.merge_id is not null and menu.merge_id!=''
|
|
|
+ </if>
|
|
|
+ <if test="mergeFlag!=null and mergeFlag==0">
|
|
|
+
|
|
|
+ and menu.merge_id is null or menu.merge_id=''
|
|
|
</if>
|
|
|
</sql>
|
|
|
<select id="selectList" parameterType="com.platform.dao.dto.longyanpurchaseorder.LongYanPurchaseOrderDTO"
|
