优化

platform-dao/src/main/java/com/platform/dao/dto/longyanpurchaseorder/LongYanPurchaseOrderDTO.java

@@ -23,6 +23,7 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class LongYanPurchaseOrderDTO extends BaseDTO implements Serializable {
+    private Integer mergeFlag;//0:未合并，1：已合并
     private String mergeId;//请购单合并id
 
     private Double ipertaxrate;//税率

platform-dao/src/main/resources/mapper/longyanpurchaseorder/LongYanPurchaseOrderMapper.xml

@@ -98,6 +98,14 @@
         <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>
     </sql>
     <select id="selectList" parameterType="com.platform.dao.dto.longyanpurchaseorder.LongYanPurchaseOrderDTO"
             resultType="com.platform.dao.vo.query.longyanpurchaseorder.LongYanPurchaseOrderVO">