'commit'

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

@@ -1030,7 +1030,11 @@ public class CollectModel {
         kv.set("job_id", job_id);
         if (!StrKit.isBlank(keyword)) kv.set("keyword", keyword);
         if (is_finish != -1) kv.set("is_finish", is_finish);
-        kv.set("fill_type_id", fill_type_id);
+
+        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);
+
         SqlPara sqlPara = Db.getSqlPara("Collect.listFilledJob", kv);
         Page<Record> pageRecord = Db.paginate(page, limit, sqlPara);
         for (Record record : pageRecord.getList()) {

src/main/resource/Sql/Collect.sql

@@ -66,8 +66,14 @@
         #if(is_finish)
           and t1.is_finish=#para(is_finish)
         #end
-        #if(fill_type_id)
-          and t1.fill_type_id=#para(fill_type_id)
+        #if(fill_type_id_1)
+          and t1.fill_type_id in (1,3)
+        #end
+        #if(fill_type_id_2)
+          and t1.fill_type_id = (2,3)
+        #end
+        #if(fill_type_id_3)
+          and t1.fill_type_id in (3)
         #end
         #if(keyword)
          and t2.org_name like #para(keyword, "like")