Merge branch 'fix/待办已办根据标题查询未过滤权限' into 'wrdp'

[流程平台]修复待办已办根据标题查询未过滤权限的问题

See merge request o2oa/o2oa!5666

o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/read/V2Base.java

@@ -441,7 +441,7 @@ abstract class V2Base extends StandardJaxrsAction {
 		if (StringUtils.isNotEmpty(wi.getTitle())) {
 			String title = StringTools.escapeSqlLikeKey(wi.getTitle());
 			if (StringUtils.isNotEmpty(title)) {
-				p = cb.and(cb.like(root.get(Read_.title), "%" + title + "%"));
+				p = cb.and(p, cb.like(root.get(Read_.title), "%" + title + "%"));
 			}
 		}
 		return p;
@@ -512,4 +512,4 @@ abstract class V2Base extends StandardJaxrsAction {
 		}
 	}
 
-}
\ No newline at end of file
+}

o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/readcompleted/V2Base.java

@@ -462,7 +462,7 @@ abstract class V2Base extends StandardJaxrsAction {
 		if (StringUtils.isNotEmpty(wi.getTitle())) {
 			String title = StringTools.escapeSqlLikeKey(wi.getTitle());
 			if (StringUtils.isNotEmpty(title)) {
-				p = cb.and(cb.like(root.get(ReadCompleted_.title), "%" + title + "%"));
+				p = cb.and(p, cb.like(root.get(ReadCompleted_.title), "%" + title + "%"));
 			}
 		}
 		return p;
@@ -532,4 +532,4 @@ abstract class V2Base extends StandardJaxrsAction {
 		}
 	}
 
-}
\ No newline at end of file
+}

o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/task/V2Base.java

@@ -434,7 +434,7 @@ abstract class V2Base extends StandardJaxrsAction {
 		if (StringUtils.isNotEmpty(wi.getTitle())) {
 			String title = StringTools.escapeSqlLikeKey(wi.getTitle());
 			if (StringUtils.isNotEmpty(title)) {
-				p = cb.and(cb.like(root.get(Task_.title), "%" + title + "%"));
+				p = cb.and(p, cb.like(root.get(Task_.title), "%" + title + "%"));
 			}
 		}
 		return p;

o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/taskcompleted/V2Base.java

@@ -479,7 +479,7 @@ abstract class V2Base extends StandardJaxrsAction {
 		if (StringUtils.isNotEmpty(wi.getTitle())) {
 			String title = StringTools.escapeSqlLikeKey(wi.getTitle());
 			if (StringUtils.isNotEmpty(title)) {
-				p = cb.and(cb.like(root.get(TaskCompleted_.title), "%" + title + "%"));
+				p = cb.and(p, cb.like(root.get(TaskCompleted_.title), "%" + title + "%"));
 			}
 		}
 		return p;
@@ -552,4 +552,4 @@ abstract class V2Base extends StandardJaxrsAction {
 		}
 	}
 
-}
\ No newline at end of file
+}