'commit'

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

@@ -1385,10 +1385,6 @@ public class CollectModel {
 
         //判断是 市：1 县区：2 单位：3
         int publish_job_type_id = getPublishJobTypeId(publish_role_id);
-        SqlPara sqlPara;
-        if (publish_job_type_id == 2) {
-            sqlPara = Db.getSqlPara("Collect.viewJobListForArea", kv);
-        } else {
         if (!StrKit.isBlank(status_codes)) {
             List<Integer> idList = new ArrayList<>();
             for (String s : status_codes.split(",")) {
@@ -1397,6 +1393,11 @@ public class CollectModel {
             }
             kv.set("idList", idList);
         }
+
+        SqlPara sqlPara;
+        if (publish_job_type_id == 2) {
+            sqlPara = Db.getSqlPara("Collect.viewJobListForArea", kv);
+        } else {
             sqlPara = Db.getSqlPara("Collect.viewJobList", kv);
         }
 

src/main/resource/Sql/Collect.sql

@@ -89,6 +89,9 @@
             #if(keyword)
              and t1.job_name like #para(keyword, "like")
             #end
+            #if(idList)
+                and  t2.status_code in #para(idList, "in")
+            #end
             order by t1.job_id desc
     #end
     -- 任务列表 (个人)