From 18b5d0c32f8de3fe53a8a08e07b91a6ec68b0be9 Mon Sep 17 00:00:00 2001
From: htjcAdmin <qinyanlei@ht-atia.com>
Date: Tue, 27 May 2025 15:36:27 +0800
Subject: [PATCH] =?UTF-8?q?/*=E5=8D=A1=E7=89=87-=E5=B7=A1=E8=A7=86?=
 =?UTF-8?q?=E6=96=B9=E6=A1=88-=E6=8C=89=E5=8C=BA=E5=9F=9F=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E6=90=9C=E7=B4=A2=EF=BC=9A=E6=90=9C=E7=B4=A2=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9;*/?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task/controller/PatrolTaskController.java     | 15 +++++++++++++--
 .../resources/mapper/task/PatrolTaskMapper.xml    |  2 +-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java
index 0995b2f..22e4a4c 100644
--- a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java
+++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java
@@ -123,6 +123,7 @@ public class PatrolTaskController extends BaseController {
     public TableDataInfo list(PatrolTask patrolTask) {
         startPage();
         List<PatrolTask> taskList = patrolTaskService.selectPatrolTaskList(patrolTask);
+        logger.info("[TASK] patrolTask: {}, taskList: {}", patrolTask, taskList);
         for (PatrolTask task : taskList) {
             PatrolTaskStatus patrolTaskStatus = new PatrolTaskStatus();
             patrolTaskStatus.setTaskCode(task.getTaskCode());
@@ -139,15 +140,25 @@ public class PatrolTaskController extends BaseController {
             // 检查响应是否成功
             if ("200".equals(ajaxResult.get("code").toString())) {
                 JSONArray data = jsonObject.getJSONArray("data");
-                if (data != null && data.size() > 0) {
+                if (data != null && !data.isEmpty()) {
                     List<String> areaNames = data.stream()
                             .map(item -> ((JSONObject) item).getString("areaName"))
                             .collect(Collectors.toList());
-                    task.setAreaName(StringUtils.join(areaNames, ","));
+                    task.setAreaName(StringUtils.join(areaNames, StringUtils.COMMA));
                 }
             }
         }
 
+        if(StringUtils.isNotEmpty(patrolTask.getAreaName())) {
+            List<PatrolTask> taskListEx = new ArrayList<>();
+            for (PatrolTask task : taskList) {
+                if(StringUtils.isNotEmpty(task.getAreaName()) && task.getAreaName().contains(patrolTask.getAreaName())) {
+                    taskListEx.add(task);
+                }
+            }
+
+            return getDataTable(taskListEx);
+        }
         return getDataTable(taskList);
     }
 
diff --git a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskMapper.xml b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskMapper.xml
index 6f345c8..f5f900d 100644
--- a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskMapper.xml
+++ b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskMapper.xml
@@ -124,7 +124,7 @@
             <if test="devType != null  and devType != ''">and dev_type = #{devType}</if>
             <if test="storage != null  and storage != ''">and storage = #{storage}</if>
             <if test="areaId != null  and areaId != ''">and area_id = #{areaId}</if>
-            <if test="areaName != null  and areaName != ''">and area_name = #{areaName}</if>
+<!--            <if test="areaName != null  and areaName != ''">and area_name = #{areaName}</if>-->
             <if test="executionMode != null  and executionMode != ''">and execution_mode = #{executionMode}</if>
             <if test="linkageState != null  and linkageState != ''">and linkage_state = #{linkageState}</if>
             <if test="isUp != null  and isUp != ''">and is_up = #{isUp}</if>