diff --git a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml index 46246817..f89868b1 100644 --- a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml +++ b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml @@ -76,6 +76,7 @@ + @@ -845,7 +846,8 @@ 1 = 1 AND su.id = taa.user_id AND su.dept_id = sd.id - AND EXISTS ( SELECT 1 FROM tb_data_resource WHERE tb_data_resource.id = taa.resource_id AND tb_data_resource.del_flag = 0 ) + AND EXISTS ( SELECT 1 FROM tb_data_resource WHERE tb_data_resource.id = taa.resource_id AND + tb_data_resource.del_flag = 0 ) GROUP BY sd.id ORDER BY @@ -1047,7 +1049,7 @@ COUNT( tdav.data_resource_id ) AS total FROM (SELECT a.* FROM tb_data_attr a INNER JOIN tb_data_resource c ON a.data_resource_id = c.id - WHERE c.type = #{resourceType} AND c.dept_id = #{id} AND c.del_flag = 0) tdav + WHERE c.type = #{resourceType} AND c.dept_id = #{id} AND c.del_flag = 0) tdav JOIN mysql.help_topic b ON b.help_topic_id < ( LENGTH( tdav.attr_value ) - LENGTH( REPLACE ( tdav.attr_value, ';', '' ) ) + 1 ) WHERE