Merge branch 'master' into docker_package

2022-07-07 18:17:15 +08:00 · 2022-07-07 18:17:15 +08:00 · b349a87010
parent 75b10cd9d1 7dec63c6c8
commit b349a87010
1 changed files with 1 additions and 0 deletions
--- a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
+++ b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
@ -845,6 +845,7 @@
        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 )
        GROUP BY
        sd.id
        ORDER BY