From 94258fd2a1119beaef2c8662df94eddae44c69f0 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期二, 29 十一月 2022 21:33:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/BasSteErrLogController.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasSteErrLogController.java b/src/main/java/com/zy/asrs/controller/BasSteErrLogController.java
index a0a8bf6..b745411 100644
--- a/src/main/java/com/zy/asrs/controller/BasSteErrLogController.java
+++ b/src/main/java/com/zy/asrs/controller/BasSteErrLogController.java
@@ -1,22 +1,24 @@
package com.zy.asrs.controller;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.core.common.DateUtils;
-import com.zy.asrs.entity.BasSteErrLog;
-import com.zy.asrs.service.BasSteErrLogService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.BasSteErrLog;
+import com.zy.asrs.service.BasSteErrLogService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
@RestController
public class BasSteErrLogController extends BaseController {
@@ -42,7 +44,11 @@
excludeTrash(param);
convert(param, wrapper);
allLike(BasSteErrLog.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)){
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ } else {
+ wrapper.orderBy("update_time",false);
+ }
return R.ok(basSteErrLogService.selectPage(new Page<>(curr, limit), wrapper));
}
--
Gitblit v1.9.1