diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizMapper.xml index 8e8c9f82a..3f4e59f85 100644 --- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizMapper.xml +++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizMapper.xml @@ -5,8 +5,8 @@ resultType="com.glxp.api.res.collect.CollectOrderBizResponse"> SELECT icob.*, bp.nameCode diCode, bp.zczbhhzbapzbh, bp.manufactory FROM io_collect_order_biz icob - left join basic_udirel bu on icob.relId = bu.id - left join basic_products bp on bu.uuid = bp.uuid + left join basic_udirel bu on icob.relId = bu.id + left join basic_products bp on bu.uuid = bp.uuid AND icob.thrCode LIKE concat('%', #{thrCode}, '%') @@ -23,12 +23,13 @@ and ( bp.nameCode LIKE concat('%', #{unionCode}, '%') - or bp.ybbm LIKE concat('%', #{unionCode}, '%') - or bp.sptm LIKE concat('%', #{unionCode}, '%')) + or bp.ybbm LIKE concat('%', #{unionCode}, '%') + or bp.sptm LIKE concat('%', #{unionCode}, '%')) AND ggxh LIKE concat('%', #{ggxh}, '%') + group by icob.id diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderCodeManMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderCodeManMapper.xml index 9885a4863..dddee6f88 100644 --- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderCodeManMapper.xml +++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderCodeManMapper.xml @@ -4,14 +4,14 @@