1.贸易订单列表分页查询接口调试

sckw-modules/sckw-order/src/main/resources/mapper/KwoTradeOrderMapper.xml

@@ -235,7 +235,7 @@
         LEFT JOIN kwo_trade_order_contract f ON a.id = f.t_order_id AND f.del_flag = 0
         <where>
             a.del_flag = 0
-            --数据权限匹配
+--             数据权限匹配
             <if test="query.isMain == 0">
                 and ((
                 <if test="query.entId != null">
@@ -290,22 +290,22 @@
                 </if>)
                 )
             </if>
-            --状态匹配
+--             状态匹配
             <if test="query.status != null">
                 and a.status =#{query.status}
                 <if test="query.status == 0">
-                    --草稿状态只能创建订单的人能看
+--                     草稿状态只能创建订单的人能看
                     and a.create_by = #{query.userId}
                 </if>
             </if>
             <if test="query.status == null">
-                -- 非草稿状态or草稿状态且是当前人
+--                 非草稿状态or草稿状态且是当前人
                 and (
                 a.status != 0
                 or (a.status = 0 and a.create_by = #{query.userId})
                 )
             </if>
-            --关键词匹配
+--             关键词匹配
             <if test="query.keywords != null and query.keywords != ''">
                 and (
                 a.t_order_no like concat('%', #{query.keywords}, '%')
@@ -473,7 +473,7 @@
         LEFT JOIN kwo_trade_order_goods g ON a.id = g.t_order_id AND g.del_flag = 0
         <where>
             a.del_flag = 0
-            --数据权限匹配
+--             数据权限匹配
             <if test="query.isMain == 0">
                 and ((
                 <if test="query.entId != null">
@@ -528,22 +528,22 @@
                 </if>)
                 )
             </if>
-            --状态匹配
+--             状态匹配
             <if test="query.status != null">
                 and a.status =#{query.status}
                 <if test="query.status == 0">
-                    --草稿状态只能创建订单的人能看
+--                     草稿状态只能创建订单的人能看
                     and a.create_by = #{query.userId}
                 </if>
             </if>
             <if test="query.status == null">
-                --非草稿状态or草稿状态且是当前人
+--                 非草稿状态or草稿状态且是当前人
                 and (
                 a.status != 0
                 or (a.status = 0 and a.create_by = #{query.userId})
                 )
             </if>
-            --          关键词匹配
+--                      关键词匹配
             <if test="query.keywords != null and query.keywords != ''">
                 and (
                 a.t_order_no like concat('%', #{query.keywords}, '%')
@@ -596,7 +596,7 @@
         AND e.unit_type = "2" AND e.del_flag = 0
         <where>
             a.del_flag = 0
-            --数据权限匹配
+--             数据权限匹配
             <if test="query.isMain == 0">
                 and ((
                 <if test="query.entId != null">
@@ -661,7 +661,7 @@
                     and e.top_ent_id = #{query.entId}
                 </if>
             </if>
-            --状态匹配
+--             状态匹配
             <if test="statuses != null and statuses.size() > 0">
                 and a.status in
                 <foreach collection="statuses" item="item" open="(" close=")" separator=",">