'commit'

src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java

@@ -1003,7 +1003,7 @@ public class CollectModel {
         if (fill_type_id == 1) kv.set("fill_type_id_1", 1);
         else if (fill_type_id == 2) kv.set("fill_type_id_2", 1);
         else if (fill_type_id == 3) kv.set("fill_type_id_3", 1);
-        if (forward_progress != -1) kv.set("forward_progress", forward_progress);
+        kv.set("forward_progress", forward_progress);
 
         SqlPara sqlPara = Db.getSqlPara("Collect.viewJobList", kv);
         Page<Record> pageRecord = Db.paginate(page, limit, sqlPara);

src/main/resource/Sql/Collect.sql

@@ -58,7 +58,7 @@
           and t2.fill_type_id in (3)
         #end
         #if(forward_progress)
-          and t2.forward_progress=2
+          and t2.forward_progress=#para(forward_progress)
         #end
         #if(keyword)
          and t1.job_name like #para(keyword, "like")