From 2fd4a6e9efc0e603547f6742f2fb7c1381ddbf7e Mon Sep 17 00:00:00 2001
From: sunchenliang <2532527871@qq.com>
Date: Mon, 18 Mar 2024 18:31:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=88=E5=AE=A1=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/oa/OcrTaskchildPictureMapper.xml   | 53 +++++++++++--------
 1 file changed, 31 insertions(+), 22 deletions(-)

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 ad5e8822..8080fc49 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
@@ -167,28 +167,37 @@
 		</where>
 	</sql>
 	<select id="listFinal" resultType="cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPicture" parameterType="java.util.Map">
-
-select tcp.*,pic.field11 reporttime from (
-			select
-			tc.*
-			from ocr_taskchild_picture tc,OA_USERFINAL_T uf
-			where tc.ID = uf.FORMID
-			<if test="thisLoginUserid != null"> and uf.USERID ${thisLoginUserid.dataOp} ${thisLoginUserid.likestar}#{thisLoginUserid.value}${thisLoginUserid.likeend}</if>
-			UNION
-			select
-			tc.*
-			from ocr_taskchild_picture tc
-			where tc.STATES = 5
-		) as tcp,ocr_picture pic
-		where tcp.PICTUREID = pic.ID
-		<include refid="Base_Where_union"></include>
-		<if test="fromuptimeStart != null"> and tcp.fromuptime &gt;= ${fromuptimeStart}  </if>
-		<if test="fromuptimeEnd != null"> and tcp.fromuptime &lt;= ${fromuptimeEnd}  </if>
-		<if test="page != null">
-			<if test="page.sortname != null"> order by tcp.${page.sortname} ${page.sortorder}</if>
-			limit ${page.start}, ${page.Pagesize}
-		</if>
-	</select>
+        select tcp.*,pic.field11 reporttime from (
+        select
+        tc.*
+        from ocr_taskchild_picture tc,OA_USERFINAL_T uf
+        where tc.ID = uf.FORMID
+        <if test="thisLoginUserid != null">
+            and uf.USERID ${thisLoginUserid.dataOp}
+            ${thisLoginUserid.likestar}#{thisLoginUserid.value}${thisLoginUserid.likeend}
+        </if>
+        UNION
+        select
+        tc.*
+        from ocr_taskchild_picture tc
+        where tc.STATES = 5
+        ) as tcp left join ocr_picture pic
+        on tcp.PICTUREID = pic.ID
+        <include refid="Base_Where_union">
+        </include>
+        <if test="fromuptimeStart != null">
+            and tcp.fromuptime &gt;= ${fromuptimeStart}
+        </if>
+        <if test="fromuptimeEnd != null">
+            and tcp.fromuptime &lt;= ${fromuptimeEnd}
+        </if>
+        <if test="page != null">
+            <if test="page.sortname != null">
+                order by tcp.${page.sortname} ${page.sortorder}
+            </if>
+            limit ${page.start}, ${page.Pagesize}
+        </if>
+    </select>
 	<select id="listFinalCount" resultType="java.lang.Long" parameterType="java.util.Map">
 		select count(tcp.ID) from (
 		select