Merge branch 'fix/视图不能过滤内容管理草稿问题' into 'develop_java8'

[数据中心]修复视图不能过滤内容管理草稿问题

See merge request o2oa/o2oa!3330

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

@@ -271,6 +271,7 @@ public class CmsPlan extends Plan {
 			ps.add(this.documentPredicate_appInfo(cb, root));
 			ps.add(this.documentPredicate_date(cb, root));
 			ps.add(this.documentPredicate_Filter(cb, root, runtime, filterList));
+			ps.add(this.documentPredicate_draft(cb, root));
 
 			Predicate predicate = this.documentPredicate_typeScope(cb, root);
 			if (predicate != null) {
@@ -375,6 +376,13 @@ public class CmsPlan extends Plan {
 			return null;
 		}
 
+		private Predicate documentPredicate_draft(CriteriaBuilder cb, Root<Document> root) {
+			if (BooleanUtils.isFalse(this.draft)) {
+				return cb.isNotNull(root.get(Document_.publishTime));
+			}
+			return null;
+		}
+
 		private Predicate documentPredicate_Filter(CriteriaBuilder cb, Root<Document> root, Runtime runtime,
 				List<FilterEntry> filterList) throws Exception {
 			boolean flag = true;