diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml index 67027682..4f79843d 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml @@ -394,24 +394,26 @@ SELECT *,row_id as bomRowId FROM t_bom_new_ebom_parent - - AND created_by = #{userCode} - - - WHERE status IN (1,3) AND (user_root_is=1 OR root_is_for_wait_review=1) AND created_by=#{userCode} - - - WHERE root_is=1 AND status=2 - - - WHERE root_is=1 AND status=4 - - - AND devise_name=#{query.deviseName} - - - AND created_time BETWEEN #{query.startDate} AND DATE_ADD(#{query.endDate}, INTERVAL 1 DAY) - + + + AND created_by = #{userCode} + + + AND status IN (1,3) AND (user_root_is=1 OR root_is_for_wait_review=1) AND created_by=#{userCode} + + + AND root_is=1 AND status=2 + + + AND root_is=1 AND status=4 + + + AND devise_name=#{query.deviseName} + + + AND created_time BETWEEN #{query.startDate} AND DATE_ADD(#{query.endDate}, INTERVAL 1 DAY) + + order by row_id desc