fix: 增加高级检索列表排序字段

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<>();

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);
+
+
+		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);