From 26d9d826a3e287752df11007bbe9e0514c7df330 Mon Sep 17 00:00:00 2001 From: Benjamin Gamard Date: Wed, 17 Oct 2018 16:51:07 +0200 Subject: [PATCH] fix permission query --- .../src/main/java/com/sismics/docs/core/dao/AclDao.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs-core/src/main/java/com/sismics/docs/core/dao/AclDao.java b/docs-core/src/main/java/com/sismics/docs/core/dao/AclDao.java index 31743a5f..2b32396b 100644 --- a/docs-core/src/main/java/com/sismics/docs/core/dao/AclDao.java +++ b/docs-core/src/main/java/com/sismics/docs/core/dao/AclDao.java @@ -128,8 +128,9 @@ public class AclDao { StringBuilder sb = new StringBuilder("select a.ACL_ID_C from T_ACL a "); sb.append(" where a.ACL_TARGETID_C in (:targetIdList) and a.ACL_SOURCEID_C = :sourceId and a.ACL_PERM_C = :perm and a.ACL_DELETEDATE_D is null "); sb.append(" union all "); - sb.append(" select a.ACL_ID_C from T_ACL a, T_DOCUMENT_TAG dt "); - sb.append(" where a.ACL_SOURCEID_C = dt.DOT_IDTAG_C and dt.DOT_IDDOCUMENT_C = :sourceId and dt.DOT_DELETEDATE_D is null "); + sb.append(" select a.ACL_ID_C from T_ACL a, T_DOCUMENT_TAG dt, T_DOCUMENT d "); + sb.append(" where a.ACL_SOURCEID_C = dt.DOT_IDTAG_C and dt.DOT_IDDOCUMENT_C = d.DOC_ID_C and dt.DOT_DELETEDATE_D is null "); + sb.append(" and d.DOC_ID_C = :sourceId and d.DOC_DELETEDATE_D is null "); sb.append(" and a.ACL_TARGETID_C in (:targetIdList) and a.ACL_PERM_C = :perm and a.ACL_DELETEDATE_D is null "); Query q = em.createNativeQuery(sb.toString()); q.setParameter("sourceId", sourceId);