From c4a427aa387548a7748e55fc801cbc564a5a0015 Mon Sep 17 00:00:00 2001
From: dx <1242347652@qq.com>
Date: Fri, 28 Feb 2025 15:32:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=91=E5=B8=83=E9=83=A8=E9=97=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/admin/taskinfo/vo/TaskInfoPageReqVO.java   | 2 +-
 .../src/main/resources/mapper/taskinfo/TaskInfoMapper.xml | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/taskinfo/vo/TaskInfoPageReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/taskinfo/vo/TaskInfoPageReqVO.java
index 1e358c7..a80110b 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/taskinfo/vo/TaskInfoPageReqVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/taskinfo/vo/TaskInfoPageReqVO.java
@@ -80,7 +80,7 @@ public class TaskInfoPageReqVO extends PageParam {
      */
 
     @Schema(description = "任务标签集合", example = "1")
-    private List<Long> tagList;
+    private String tagList;
 
     @Schema(description = "按时间查询", example = "1")
     private Integer selectWeek;
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/taskinfo/TaskInfoMapper.xml b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/taskinfo/TaskInfoMapper.xml
index 3ca9bd0..1d8ddee 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/taskinfo/TaskInfoMapper.xml
+++ b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/taskinfo/TaskInfoMapper.xml
@@ -18,8 +18,7 @@
              left join enterprise_inspections ei on t.id = ei.task_id
              left join inspections_log il on ei.id = il.inspections_id
              left join enterprises e on e.id = ei.enterprise_id
-             left join task_tag tt on t.id = tt.task_id
-             left join tag_library tl on tl.id = tt.tag_id
+             left join tag_library tl on tl.id = t.task_type
         WHERE
             t.deleted = 0  and ei.deleted = 0 and ei.status = 2
         <if test="params.userId != null and params.userId != ''">
@@ -38,10 +37,7 @@
             AND t.end_date between #{params.startTime} and #{params.endTime}
         </if>
         <if test="params.tagList != null and params. tagList != ''">
-            AND tl.id in
-                <foreach collection="params.tagList" item="tagId" open="(" separator="," close=")">
-                    #{tagId}
-                </foreach>
+            AND t.task_type =  #{params.tagList}
         </if>
             GROUP BY t.id ORDER BY t.create_time DESC
     </select>