From fc17eca01ff99c67c1c617cc14b2973b34aeb5f5 Mon Sep 17 00:00:00 2001
From: shuliYao <1397940314@qq.com>
Date: Mon, 13 May 2024 17:46:17 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A2=9E=E5=8A=A0=E9=AB=98=E7=BA=A7?=
 =?UTF-8?q?=E6=A3=80=E7=B4=A2=E5=88=97=E8=A1=A8=E6=8E=92=E5=BA=8F=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocr/api/impl/PrevailCloudApiImpl.java      |  3 +++
 .../controller/OcrUsersearchController.java    | 18 +++++++++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/impl/PrevailCloudApiImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/impl/PrevailCloudApiImpl.java
index 2beafe0c..88321072 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/impl/PrevailCloudApiImpl.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/impl/PrevailCloudApiImpl.java
@@ -125,6 +125,9 @@ public class PrevailCloudApiImpl implements PrevailCloudApi {
             //解析基础数据
             String data = ApiHelper.decryptResponse(apiConfig.getAccessCode(), resultData);
             ApiPage<String> apiPage = JSONUtil.toBean(data, ApiPage.class);
+            if(apiPage.getTotal()==0){
+                return null;
+            }
             //解析数据结果为List
             List<PictureSourceResult> listResult = JSONUtil.toList(JSONObject.toJSONString(apiPage.getRecords()), PictureSourceResult.class);
             ApiPage<PictureSourceResult> resultApiPage = new ApiPage<>();
diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrUsersearchController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrUsersearchController.java
index 205068e6..b282043b 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrUsersearchController.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrUsersearchController.java
@@ -69,11 +69,12 @@ public class OcrUsersearchController extends BaseController{
 	@GetMapping(value = "/list")
 	public ResultVo<IPage<OcrUsersearch>> queryPageList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 														  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-														@RequestParam(name="type") @ApiParam(value = "类型(首页为0，终审为1)", required = true) Integer type,
+														@RequestParam(name="type") @ApiParam(value = "类型（首页：0，终审：1，任务审批：2）", required = true) Integer type,
+														@RequestParam(name="orderName", defaultValue="", required = false)String orderName,
+														@RequestParam(name="orderType",defaultValue="", required = false)String orderType,
 														  HttpServletRequest request) {
 		//获取当前登录人
 		UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
-
 		ParamterPage paramterPage = new ParamterPage();
 		paramterPage.setPagesize(pageSize);
 		paramterPage.setStart(pageNo);
@@ -93,7 +94,18 @@ public class OcrUsersearchController extends BaseController{
 		queryWrapper.eq("USERID",userToken.getUserid());
 		queryWrapper.eq("TENANTID",tenantId);
 		queryWrapper.eq("TYPE",type);
-		queryWrapper.orderByDesc(Arrays.asList("IZTOP","REORDER"));
+
+
+		if(StringUtils.isNotBlank(orderName)){
+			if("desc".equals(orderType)){
+				queryWrapper.orderByDesc(orderName);
+			}else{
+				queryWrapper.orderByAsc(orderName);
+			}
+		}else{
+			queryWrapper.orderByDesc(Arrays.asList("IZTOP","REORDER"));
+		}
+
 
 		IPage<OcrUsersearch> pageList = ocrUsersearchService.selectSearchListPage(paramterPage, queryWrapper);