From 220d3d9f0e6d38d435b7886dbf412a13733d621e Mon Sep 17 00:00:00 2001
From: yitonglei <ytl653@163.com>
Date: Fri, 1 Jul 2022 09:31:22 +0800
Subject: [PATCH 1/2] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E8=83=BD?=
 =?UTF-8?q?=E5=8A=9B=E7=BB=9F=E8=AE=A1=E5=88=97=E8=A1=A8=E5=92=8C=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85-=E4=BD=BF=E7=94=A8=E6=83=85=E5=86=B5=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E7=9A=84sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/resource/service/impl/ResourceServiceImpl.java    | 2 +-
 .../src/main/resources/mapper/resource/ResourceDao.xml        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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 95fd0fb1..0cc64c1a 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
@@ -1397,7 +1397,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
             return new PageData<>(list, list.size());
         }
 
-        //分别根据部门获取应用组件数和收藏组件数
+        //分别根据部门获取应用组件数和申请组件数
         Map<String, Object> paraMap = new ConcurrentHashMap<>();
         paraMap.put("resourceType", params.get("resourceType"));
         CompletableFuture<Void> voidCompletableFuture01 = CompletableFuture.runAsync(() -> {
diff --git a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
index 4af32bc4..e855d7b5 100644
--- a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
+++ b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
@@ -1295,14 +1295,14 @@
     <select id="assemblyCarByDept" parameterType="java.util.Map" resultType="java.util.Map">
         SELECT COUNT(distinct(a.resource_id)) as carNum,c.id FROM tb_resource_car a INNER JOIN sys_user b ON a.creator =
         b.id INNER JOIN sys_dept c ON b.dept_id = c.id INNER JOIN tb_data_resource d on a.resource_id = d.id
-        WHERE a.del_flag = 0 AND d.type = #{resourceType} AND (c.id =#{id} or INSTR(c.pids,#{id})) group by c.id
+        WHERE a.del_flag = 0 AND c.id =#{id}  AND d.type = #{resourceType} group by c.id
     </select>
 
     <!--根据组件类型查询部门使用组件的数量-->
     <select id="assemblyUseByDept" parameterType="java.util.Map" resultType="java.util.Map">
         SELECT COUNT(distinct(a.key_id)) as useNum,c.id FROM tb_data_resource_rel a INNER JOIN sys_user b ON a.creator =
         b.id INNER JOIN sys_dept c ON b.dept_id = c.id INNER JOIN tb_data_resource d on a.key_id = d.id
-        WHERE a.del_flag = 0 AND d.type = #{resourceType} AND (c.id = #{id} or INSTR(c.pids,#{id} )) group by c.id
+        WHERE a.del_flag = 0 AND d.type = #{resourceType} AND c.id = #{id}  group by c.id
     </select>
 
     <select id="selectCountByDepts" resultType="java.util.Map">

From f7f04f90e02987d1642098e5b8ba8213cba08471 Mon Sep 17 00:00:00 2001
From: yitonglei <ytl653@163.com>
Date: Fri, 1 Jul 2022 09:38:48 +0800
Subject: [PATCH 2/2] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E8=83=BD?=
 =?UTF-8?q?=E5=8A=9B=E7=BB=9F=E8=AE=A1=E5=88=97=E8=A1=A8=E5=92=8C=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85-=E4=BD=BF=E7=94=A8=E6=83=85=E5=86=B5=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E7=9A=84sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
index e855d7b5..93f00b93 100644
--- a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
+++ b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
@@ -1243,7 +1243,7 @@
         WHERE
         a.del_flag = 0
         <if test="id != null and id != ''">
-            and (b.id = #{id} OR INSTR(b.pids,#{id})
+            and (b.id = #{id} OR INSTR(b.pids,#{id}))
         </if>
         <if test="resourceType != null and resourceType != ''">
             AND