From b4d5f8dea0d3870fb87552cce208bbf6c13bbb56 Mon Sep 17 00:00:00 2001
From: wangliwen <wangliwen@hisense.com>
Date: Tue, 25 Oct 2022 13:39:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E7=94=A8=E5=B9=BF=E5=9C=BA=E6=8C=89?=
 =?UTF-8?q?=E5=BA=94=E7=94=A8=E9=A2=86=E5=9F=9F=E6=90=9C=E7=B4=A2=E4=B8=8D?=
 =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E7=9A=84=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/resource/ResourceDao.xml         | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
index 52f7ce5a..a19e71f6 100644
--- a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
+++ b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
@@ -1601,8 +1601,7 @@
             AND sd.type = #{type}
         </if>
         <if test=" area != null and area != ''">
-            AND JSON_CONTAINS( tdr.info_list, JSON_OBJECT( 'attrType', '应用领域' ))
-            AND JSON_EXTRACT( tdr.info_list, '$[*].attrValue' ) LIKE CONCAT( '%', #{area}, '%' )
+            AND JSON_EXTRACT( info_list, JSON_UNQUOTE( REPLACE ( JSON_SEARCH( info_list, 'all', '应用领域', NULL, '$[*].attrType' ), 'attrType', 'attrValue' ) ) ) LIKE CONCAT( '%', #{area}, '%' )
         </if>
         ORDER BY
         sd.type, sr.sort, sd.sort, tdr.dept_id, tdr.visitor DESC, tdr.id DESC