From be24afce0ef6f8b7fd67af1f141fef446cddf12f Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Fri, 7 Jan 2022 14:16:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=A4=96=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=20=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=AF=B9=E8=8C=83=E5=9B=B4=E6=97=A5=E6=9C=9F=E5=92=8C?=
 =?UTF-8?q?=E5=A4=9A=E9=80=89=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SarStandardsInfoController.java           | 70 +++++--------------
 1 file changed, 17 insertions(+), 53 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
index 0182065a..b94c7bbf 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
@@ -210,59 +210,23 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
     @GetMapping("/getSarStandardsInfoPageBak")
     //@RequiresPermissions("lawss:sarStandardsInfo:getSarStandardsInfoPage")
     public ResponseMessage<PageInfo<SarStandardsInfo>> getSarStandardsInfoPageBak(SarStandardsInfoEOPage page,@RequestParam(defaultValue = "0") String mark) throws Exception {
-//        int isNull = -1;
-//        if (null != page.getNowOrderBy()) {
-//            switch (page.getNowOrderBy()) {
-//                case 1:
-//                    page.setOrderByA("issueTime");//发布日期
-//                    break;
-//                case 2:
-//                    page.setOrderByA("SAR_STAND_ATTR_INFO.ZCCSSRQ");//新车型实施日期
-//                    break;
-//                case 3:
-//                    page.setOrderByA("SAR_STAND_ATTR_INFO.XCXSSRQ");//在产车实施日期
-//                    break;
-//                case 4:
-//                    page.setOrderByA("SAR_STANDARDS_INFO.text_status");//文本状态
-//                    break;
-//                case 5:
-//                    page.setOrderByA("paixu");
-//                    break;
-//                case 6:
-//                    page.setOrderByA("SAR_STAND_ATTR_INFO.SSRQ");
-//                    break;
-//                default:
-//                    page.setNowOrder(null);
-//                    break;
-//            }
-//            if (null != page.getNowOrder()) {
-//                switch (page.getNowOrder()) {
-//                    case 1:
-//                        page.setOrder1("desc");
-//                        break;
-//                    case 2:
-//                        page.setOrder1("asc");
-//                    default:
-//                        page.setOrder1(null);
-//                        break;
-//                }
-//            }
-//        }
-//
-//
-//        if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) {
-//            List<SarAdvanceSearchVO> searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class);
-//            String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList);
-//            if (StringUtils.isNotBlank(advanceStr)) {
-//                page.setAdvanceSearchStr(advanceStr);
-//            } else {
-//                page.setAdvanceSearchStr(null);
-//            }
-//        }
-//
-//        if(page.getUserId() == null || page.getUserId().equals("")){
-//            page.setUserId(LoginUserUtil.getUserId());
-//        }
+        if (null != page.getNowOrderBy()) {
+            nowOrderFunc(page);
+        }
+
+        if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) {
+            List<SarAdvanceSearchVO> searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class);
+            String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList);
+            if (StringUtils.isNotBlank(advanceStr)) {
+                page.setAdvanceSearchStr(advanceStr);
+            } else {
+                page.setAdvanceSearchStr(null);
+            }
+        }
+
+        if(page.getUserId() == null || page.getUserId().equals("")){
+            page.setUserId(LoginUserUtil.getUserId());
+        }
         List<SarStandardsInfo> rows = sarStandardsInfoEOService.getSarStandardsInfoPageBak1(page);
         return Result.success(getPageInfo(page.getPager(), rows));
     }