From 240fd8b644aa3ba4c4d41b82a7f74589155e061b Mon Sep 17 00:00:00 2001
From: shuliYao <1397940314@qq.com>
Date: Mon, 18 Mar 2024 21:40:17 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E8=A7=A3=E5=86=B3=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81=E5=88=97=E6=96=B0=E5=A2=9E=E5=A4=B1=E8=B4=A5=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xiaoyao/ocr/service/impl/OcrUserFieldServiceImpl.java   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrUserFieldServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrUserFieldServiceImpl.java
index c2d40f67..e7ff0623 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrUserFieldServiceImpl.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrUserFieldServiceImpl.java
@@ -39,7 +39,11 @@ public class OcrUserFieldServiceImpl extends BaseServiceImpl<OcrUserFieldMybatis
 		try {
 			String userFieldFixed = ocrUserField.getUserFieldFixed();
 			String userFieldUnFixed = ocrUserField.getUserFieldUnFixed();
-			String fields = userFieldFixed.concat(",").concat(userFieldUnFixed);
+			String fields = userFieldFixed;
+			if(userFieldUnFixed!=null){
+				fields =fields.concat(",").concat(userFieldUnFixed);
+			}
+
 			LambdaQueryWrapper<OcrField> ocrFieldLambdaQueryWrapper = new LambdaQueryWrapper<>();
 			ocrFieldLambdaQueryWrapper.eq(OcrField::getIsrequired,2);
 			ocrFieldLambdaQueryWrapper.eq(OcrField::getReviewType,ocrUserField.getReviewType());

From cbc6e136720f0f6f9f606deb199acfe9af2efa6a Mon Sep 17 00:00:00 2001
From: sunchenliang <2532527871@qq.com>
Date: Mon, 18 Mar 2024 22:33:35 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=95=B0=E6=8D=AE=E9=87=8D=E5=A4=8D=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/oa/OcrTaskchildPictureMapper.xml   | 45 ++++++++++---------
 1 file changed, 25 insertions(+), 20 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 8080fc49..84896666 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
@@ -215,27 +215,32 @@
 	</select>
 
 	<select id="listmytask" resultType="cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPictureAppro" parameterType="java.util.Map">
+        select tcp.* from (
+        select
+        tc.*,uf.COMMENTHIS,uf.TASKNAME as TASKNAMEHIS,uf.STATSHIS,uf.TASKINDEX,uf.TASKNO
+        from ocr_taskchild_picture tc
+        LEFT JOIN OA_USERAPPROVE_T uf ON tc.ID = uf.ID
+        where tc.ASSIGNEE = #{searchassignee} and tc.TENANTID=#{searchtenantid}
+        and tc.STATES=2
+        UNION
+        select
+        tc.*,uf.COMMENTHIS,uf.TASKNAME as TASKNAMEHIS,uf.STATSHIS,uf.TASKINDEX,uf.TASKNO
+        from ocr_taskchild_picture tc,OA_USERAPPROVE_T uf
+        where tc.ID = uf.FORMID and tc.TENANTID=#{searchtenantid}
+        <if test="thisLoginUserid != null">
+            and uf.USERID = #{thisLoginUserid}
+        </if>
+        ) as tcp
+        <include refid="Base_Where_union">
+        </include>
 
-		select tcp.* from (
-			select
-			tc.*,uf.COMMENTHIS,uf.TASKNAME as TASKNAMEHIS,uf.STATSHIS,uf.TASKINDEX,uf.TASKNO
-			from ocr_taskchild_picture tc
-			LEFT JOIN OA_USERAPPROVE_T uf ON tc.ID = uf.ID
-			where tc.ASSIGNEE = #{searchassignee} and tc.TENANTID=#{searchtenantid}
-		UNION
-			select
-			tc.*,uf.COMMENTHIS,uf.TASKNAME as TASKNAMEHIS,uf.STATSHIS,uf.TASKINDEX,uf.TASKNO
-			from ocr_taskchild_picture tc,OA_USERAPPROVE_T uf
-			where tc.ID = uf.FORMID and tc.TENANTID=#{searchtenantid}
-			<if test="thisLoginUserid != null"> and uf.USERID = #{thisLoginUserid}</if>
-		) as tcp
-		<include refid="Base_Where_union"></include>
-
-		<if test="page != null">
-			<if test="page.sortname != null"> order by tcp.${page.sortname} ${page.sortorder}</if>
-			limit ${page.start}, ${page.Pagesize}
-		</if>
-	</select>
+        <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="listmytaskCount" resultType="java.lang.Long" parameterType="java.util.Map">
 		select count(tcp.ID) from (
 			select