diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java
index be787e2..6912acd 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java
@@ -980,7 +980,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
if (StringUtils.isNotBlank(pageUtils.getSortname())) {
paramterPage.setSortname(pageUtils.getSortname());
} else {
- paramterPage.setSortname("CREATEDATE");
+ paramterPage.setSortname("submit_date_timestamp");
}
if (StringUtils.isNotBlank(pageUtils.getSortorder())) {
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 db685b0..22bb273 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
@@ -535,12 +535,21 @@
UNION
select
- tc.*
- from ocr_taskchild_picture tc, ocr_picture p
- where tc.STATES = 5 and p.suspiciousfile =0
+ tc.*
+ from ocr_taskchild_picture tc
+ where tc.STATES = 5
) as tcp
+ left join ocr_picture pic
+ on tcp.PICTUREID = pic.ID
+ and pic.suspiciousfile = 0
+
+ and tcp.fromuptime >= ${fromuptimeStart}
+
+
+ and tcp.fromuptime <= ${fromuptimeEnd}
+