diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java
index 790df9ba..7c1fb997 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java
@@ -316,7 +316,8 @@ public class FlowTaskController extends BaseController {
return ResultVoUtil.error("租户主键不能为空");
}
if (org.apache.commons.lang3.StringUtils.isNotBlank(taskName)) {
- searchQuery.addLike("fromtaskname", taskName);
+// searchQuery.addLike("fromtaskname", taskName);
+ searchQuery.addLike("fuzzyRetrieval", taskName);
}
//获取用户预设检索条件id,如果存在检索条件,则高级检索失效
diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml
index 26e8d481..9b78dd4a 100644
--- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml
+++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml
@@ -479,6 +479,14 @@
and tcp.USERID ${userid.dataOp} ${userid.likestar}#{userid.value}${userid.likeend}
+
+ and
+ (
+ tcp.FROMUSERNAME LIKE CONCAT('%', #{fuzzyRetrieval.value}, '%')
+ OR tcp.FROMTASKID LIKE CONCAT('%', #{fuzzyRetrieval.value}, '%')
+ OR tcp.FROMTASKNAME LIKE CONCAT('%', #{fuzzyRetrieval.value}, '%')
+ )
+