From 8b8d155bc2a44ff6663477d919f2382e26e3ba87 Mon Sep 17 00:00:00 2001
From: wangliwen <wangliwen@hisense.com>
Date: Mon, 19 Sep 2022 11:06:03 +0800
Subject: [PATCH] =?UTF-8?q?/resource/selectAppList=20=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=82=E6=95=B0=20area?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/renren/modules/resource/dao/ResourceDao.java   | 6 +++---
 .../modules/resource/service/impl/ResourceServiceImpl.java | 7 ++++---
 .../src/main/resources/mapper/resource/ResourceDao.xml     | 4 ++++
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/renren-admin/src/main/java/io/renren/modules/resource/dao/ResourceDao.java b/renren-admin/src/main/java/io/renren/modules/resource/dao/ResourceDao.java
index 05c79478..13bc7614 100644
--- a/renren-admin/src/main/java/io/renren/modules/resource/dao/ResourceDao.java
+++ b/renren-admin/src/main/java/io/renren/modules/resource/dao/ResourceDao.java
@@ -169,9 +169,9 @@ public interface ResourceDao extends BaseDao<ResourceEntity> {
 
     List<Map<String, Object>> selectDevelopDocResource();
 
-    List<Map<String,Object>> resourceInstallationOrDataResourceDetails(Map params);
+    List<Map<String, Object>> resourceInstallationOrDataResourceDetails(Map params);
 
-    List<Map> selectAppList(@Param("pageNum") int pageNum, @Param("type") Integer type);
+    List<Map> selectAppList(@Param("pageNum") int pageNum, @Param("type") Integer type, @Param("area") String area);
 
     String selectPicByResId(@Param("id") String id);
 
@@ -182,7 +182,7 @@ public interface ResourceDao extends BaseDao<ResourceEntity> {
     List<Map> getCIMApplyApplicationList(@Param("deptId") Long deptId);
 
 
-    List<Map> getImgServices(@Param("deptid") Long deptid,@Param("type") String type);
+    List<Map> getImgServices(@Param("deptid") Long deptid, @Param("type") String type);
 
     List<Map> cimAssemblyResources(@Param("deptid") Long deptid);
 
diff --git a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
index 9824fd34..ddb86ebc 100644
--- a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
+++ b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
@@ -1489,7 +1489,8 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
     public Object selectAppList(Map params) {
         int pageNum = Integer.parseInt(params.get("pageNum").toString());
         Integer type = params.containsKey("type") ? Integer.parseInt(params.get("type").toString()) : null;
-        List<Map> maps = resourceDao.selectAppList((pageNum - 1) * 9, type);
+        String area = params.containsKey("area") ? params.get("area").toString() : null;
+        List<Map> maps = resourceDao.selectAppList((pageNum - 1) * 9, type, area);
         maps.forEach(x -> x.put("pic", resourceDao.selectPicByResId(x.get("id").toString())));
         return maps;
     }
@@ -2036,12 +2037,12 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
     }
 
     @Override
-    public Object selectCensusResourceTable(Map params){
+    public Object selectCensusResourceTable(Map params) {
         return resourceDao.selectCensusResourceTable(params);
     }
 
     @Override
-    public Object selectCensusApplyTable(Map params){
+    public Object selectCensusApplyTable(Map params) {
         return resourceDao.selectCensusApplyTable(params);
     }
 
diff --git a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
index ae9076ba..d018e2f4 100644
--- a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
+++ b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
@@ -1564,6 +1564,10 @@
         <if test=" type != null and type != ''">
             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}, '%' )
+        </if>
         ORDER BY
         sd.type, sr.sort, sd.sort, tdr.dept_id, tdr.visitor DESC, tdr.id DESC
         LIMIT ${pageNum}, 9