From 44a1dd5d55324722b7c98f3d3bce8514ad6565cd Mon Sep 17 00:00:00 2001
From: "hong.yang" <hong.yang@ustcinfo.com>
Date: Thu, 12 Oct 2023 15:16:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=A7=BB=E9=99=A4=E5=B7=B2=E7=BB=8F?=
 =?UTF-8?q?=E6=97=A0=E7=94=A8=E7=9A=84sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/module/map/dao/DataRoomMapDao.java   |  6 ---
 .../main/resources/mapper/DataRoomMapDao.xml  | 47 +------------------
 2 files changed, 1 insertion(+), 52 deletions(-)

diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/map/dao/DataRoomMapDao.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/map/dao/DataRoomMapDao.java
index d64d60dc..71ba56fa 100644
--- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/map/dao/DataRoomMapDao.java
+++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/map/dao/DataRoomMapDao.java
@@ -17,12 +17,6 @@ import java.util.List;
 @Mapper
 public interface DataRoomMapDao extends BaseMapper<DataRoomMapEntity> {
 
-    /**
-     * 获取地图列表
-     * @return
-     */
-    List<DataRoomMapVO> getList(@Param("searchDTO") MapSearchDTO searchDTO);
-
     /**
      * 根据层级获取地图列表
      * 列表包括所有目标层级的地图，以及目标层级的父地图...
diff --git a/DataRoom/dataroom-core/src/main/resources/mapper/DataRoomMapDao.xml b/DataRoom/dataroom-core/src/main/resources/mapper/DataRoomMapDao.xml
index 560b861c..f06c668b 100644
--- a/DataRoom/dataroom-core/src/main/resources/mapper/DataRoomMapDao.xml
+++ b/DataRoom/dataroom-core/src/main/resources/mapper/DataRoomMapDao.xml
@@ -3,50 +3,6 @@
 
 <mapper namespace="com.gccloud.dataroom.core.module.map.dao.DataRoomMapDao">
 
-    <!--  查询地图数据  -->
-    <select id="getList" resultType="com.gccloud.dataroom.core.module.map.vo.DataRoomMapVO">
-        SELECT id,
-               parent_id,
-               map_code,
-               name,
-               level,
-               geo_json,
-               uploaded_geo_json,
-               create_date,
-               update_date,
-               create_by,
-               update_by,
-               del_flag,
-               id as curentMapId,
-               CASE WHEN EXISTS(SELECT 1
-                                FROM big_screen_map
-                                WHERE parent_id = curentMapId
-                                  AND del_flag = 0)
-                   THEN 1
-               ELSE 0 END AS has_children
-        FROM big_screen_map
-        WHERE del_flag = 0
-        <if test="searchDTO != null">
-            <if test="searchDTO.parentId != null and searchDTO.parentId != ''">
-                AND parent_id = #{searchDTO.parentId}
-            </if>
-            <if test="searchDTO.searchKey != null and searchDTO.searchKey != ''">
-                AND (
-                    name like concat('%', #{searchDTO.searchKey}, '%')
-                    OR map_code like concat('%', #{searchDTO.searchKey}, '%')
-                    )
-            </if>
-            <if test="searchDTO.level != null">
-                AND level = #{searchDTO.level}
-            </if>
-            <if test="searchDTO.uploadedGeoJson != null">
-                AND uploaded_geo_json = #{searchDTO.uploadedGeoJson}
-            </if>
-
-        </if>
-
-    </select>
-
     <select id="getMapByLevel" resultType="com.gccloud.dataroom.core.module.map.entity.DataRoomMapEntity">
         select id, level, parent_id, map_code
         from big_screen_map
@@ -58,5 +14,4 @@
     </select>
 
 
-
-</mapper>
\ No newline at end of file
+</mapper>