From 3120bfa076cd645c6c502bb637659d12b92a5286 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Fri, 26 Jan 2024 15:13:33 +0800
Subject: [PATCH] 'commit'

---
 .../QingLong/Collect/Model/CollectModel.java    | 17 +++++++++--------
 src/main/resource/Sql/Collect.sql               |  3 +++
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java b/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java
index 0da6ed2d..6b879919 100644
--- a/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java
+++ b/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java
@@ -1385,18 +1385,19 @@ public class CollectModel {
 
         //判断是 市：1 县区：2 单位：3
         int publish_job_type_id = getPublishJobTypeId(publish_role_id);
+        if (!StrKit.isBlank(status_codes)) {
+            List<Integer> idList = new ArrayList<>();
+            for (String s : status_codes.split(",")) {
+                int status_code = Integer.parseInt(s);
+                idList.add(status_code);
+            }
+            kv.set("idList", idList);
+        }
+
         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(",")) {
-                    int status_code = Integer.parseInt(s);
-                    idList.add(status_code);
-                }
-                kv.set("idList", idList);
-            }
             sqlPara = Db.getSqlPara("Collect.viewJobList", kv);
         }
 
diff --git a/src/main/resource/Sql/Collect.sql b/src/main/resource/Sql/Collect.sql
index 37ca4c99..7d1281b0 100644
--- a/src/main/resource/Sql/Collect.sql
+++ b/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
     -- 任务列表 (个人)