增加视图关于内容管理通过文档权限查询(接口传输parameter参数值为：{"cmsDocumentAccessFlag":"yes"}生效)，默认是review权限查询

o2server/x_query_core_express/src/main/java/com/x/query/core/express/plan/CmsPlan.java

@@ -1,5 +1,6 @@
 package com.x.query.core.express.plan;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Set;
@@ -34,6 +35,8 @@ import com.x.query.core.entity.Item_;
 
 public class CmsPlan extends Plan {
 
+	public final static String CMS_DOCUMENT_ACCESS_FLAG = "cmsDocumentAccessFlag";
+
 	public CmsPlan() {
 	}
 
@@ -89,7 +92,7 @@ public class CmsPlan extends Plan {
 		//根据where条件查询符合条件的所有文档ID列表
 		docIds = listBundle_document(emc);
 		
-		if (BooleanUtils.isTrue(this.where.accessible)) {
+		if (BooleanUtils.isTrue(this.where.accessible) && !this.runtime.parameter.containsKey(CMS_DOCUMENT_ACCESS_FLAG)) {
 			if (StringUtils.isNotEmpty(runtime.person)) {
 				//过滤可见范围
 				docIds = this.listBundle_accessible(emc, docIds, runtime.person );
@@ -130,7 +133,7 @@ public class CmsPlan extends Plan {
 		CriteriaBuilder cb = em.getCriteriaBuilder();
 		CriteriaQuery<String> cq = cb.createQuery(String.class);
 		Root<Document> root = cq.from(Document.class);
-		cq.select(root.get(Document_.id)).distinct(true).where(this.where.documentPredicate(cb, root));
+		cq.select(root.get(Document_.id)).distinct(true).where(this.where.documentPredicate(cb, root, this.runtime));
 		//System.out.println(">>>>>1-listBundle_document>>>>>>SQL:" + em.createQuery(cq).toString() );
 		List<String> docIds = em.createQuery(cq).getResultList();
 		return docIds;
@@ -264,11 +267,12 @@ public class CmsPlan extends Plan {
 		 * @return
 		 * @throws Exception
 		 */
-		private Predicate documentPredicate(CriteriaBuilder cb, Root<Document> root) throws Exception {
+		private Predicate documentPredicate(CriteriaBuilder cb, Root<Document> root, Runtime runtime) throws Exception {
 			List<Predicate> ps = new TreeList<>();
 			ps.add(this.documentPredicate_creator(cb, root));
 			ps.add(this.documentPredicate_appInfo(cb, root));
 			ps.add(this.documentPredicate_date(cb, root));
+			ps.add(this.documentPredicate_accessible(cb, root, runtime));
 			
 			Predicate predicate = this.documentPredicate_typeScope(cb, root);
 			if( predicate != null  ) {
@@ -370,5 +374,28 @@ public class CmsPlan extends Plan {
 			}
 			return null;
 		}
+
+		private Predicate documentPredicate_accessible(CriteriaBuilder cb, Root<Document> root, Runtime runtime) throws Exception {
+			if (!BooleanUtils.isTrue(this.accessible) || !runtime.parameter.containsKey(CmsPlan.CMS_DOCUMENT_ACCESS_FLAG)) {
+				return null;
+			}
+			List<Predicate> matchEach = new ArrayList<>();
+			matchEach.add(cb.isMember("所有人", root.get(Document_.readPersonList)));
+			if(StringUtils.isNotEmpty(runtime.person)){
+				matchEach.add(cb.isMember(runtime.person, root.get(Document_.readPersonList)));
+			}
+			if(ListTools.isNotEmpty(runtime.unitAllList)){
+				for (String unit : runtime.unitAllList){
+					matchEach.add(cb.isMember(unit, root.get(Document_.readUnitList)));
+				}
+			}
+			if(ListTools.isNotEmpty(runtime.groupList)){
+				for (String group : runtime.groupList){
+					matchEach.add(cb.isMember(group, root.get(Document_.readGroupList)));
+				}
+			}
+			return cb.or(matchEach.toArray(new Predicate[] {}));
+
+		}
 	}
 }