From be042a94b09a7547a80985aae3023659cce0591c Mon Sep 17 00:00:00 2001
From: lizhicheng <lizhicheng2@hisense.com>
Date: Mon, 3 Oct 2022 16:06:42 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=EF=BC=9A=E5=AE=A1=E6=89=B9=E5=8D=95=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
index 620f2d6d..9ab94a6e 100644
--- a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
+++ b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
@@ -1785,12 +1785,13 @@
 
     <select id="selectCensusResourceTable" resultType="java.util.Map">
         SELECT sd.name AS deptName, tdr.name AS resourceName, tdr.type, tdr.create_date AS createDate,
-        if(tdr.del_flag=0, '审核通过', '审核中') AS approveStatus
+        if(tdr.del_flag=0, '审核通过', '审核中') AS approveStatus, trma.apply_number AS applyNumber
         FROM (SELECT IF(d.type='组件服务', A.attr_value, d.type) AS type, d.id, d.del_flag, d.dept_id, d.create_date,
         d.name
         FROM tb_data_resource d LEFT JOIN tb_data_attr a ON d.id=a.data_resource_id AND a.attr_type='组件类型' AND
         a.del_flag=0
-        WHERE d.type NOT IN ('知识库','基础设施','数据资源')) tdr,
+        WHERE d.type NOT IN ('知识库','基础设施','数据资源')) tdr
+        LEFT JOIN t_resource_mount_apply trma on tdr.id=trma.resource_id,
         sys_dept sd
         WHERE 1=1 AND tdr.dept_id=sd.id
         <choose>
@@ -1818,7 +1819,7 @@
 
     <select id="selectCensusApplyTable" resultType="java.util.Map">
         SELECT sd.name AS deptName, tdr.name AS resourceName, tdr.type, taa.create_date AS createDate,
-        taa.approve_status AS approveStatus
+        taa.approve_status AS approveStatus, taa.apply_number AS applyNumber
         FROM (SELECT IF(d.type='组件服务', A.attr_value, d.type) AS type, d.id, d.del_flag, d.dept_id, d.create_date,
         d.name
         FROM tb_data_resource d LEFT JOIN tb_data_attr a ON d.id=a.data_resource_id AND a.attr_type='组件类型' AND