diff --git a/src/main/resources/mappers/backstage/ProProgressMapper.xml b/src/main/resources/mappers/backstage/ProProgressMapper.xml index 88ec1b0..91c025d 100644 --- a/src/main/resources/mappers/backstage/ProProgressMapper.xml +++ b/src/main/resources/mappers/backstage/ProProgressMapper.xml @@ -227,14 +227,14 @@ tt.sort FROM tb_tower tt - LEFT JOIN tb_tower_pouring ttp ON tt.id = ttp.tower_id AND tt.tower_progress = 3 + LEFT JOIN tb_tower_pouring ttp ON tt.id = ttp.tower_id AND tt.tower_progress >= #{type} - 1 WHERE tt.pro_id = #{id} AND tt.is_actvice = '1' AND tt.tower_progress >= #{type} - AND tt.tower_progress = #{type} - 1 + AND tt.tower_progress >= #{type} - 1 AND ttp.finish_status = '1' ) A ORDER BY sort,leg