Merge branch 'dev'

renren-admin/src/main/resources/mapper/resource/ResourceDao.xml

@@ -1838,21 +1838,43 @@
     </select>
 
     <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.apply_flag 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,
+        SELECT
+        sd.NAME AS deptName,
+        tdr.NAME AS resourceName,
+        dept.`name` AS resourceDeptName,
+        tdr.type,
+        taa.create_date AS createDate,
+        taa.approve_status AS approveStatus,
+        taa.apply_flag 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,
         sys_dept sd,
         sys_user su,
-        t_ability_application taa
-        WHERE 1 = 1
+        t_ability_application taa,
+        sys_dept dept
+        WHERE
+        1 = 1
         AND tdr.del_flag = 0
         AND taa.user_id = su.id
         AND su.dept_id = sd.id
         AND taa.resource_id = tdr.id
+        AND dept.id = tdr.dept_id
         <choose>
             <when test="approveStatus != null and approveStatus != ''">
                 AND taa.approve_status = #{approveStatus}