From 75888c8fa0e818ae07bc7e1199a61ce8750311cd Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Fri, 27 Aug 2021 17:43:56 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=A6=96=E9=A1=B5=20=E7=BB=93=E6=9D=9F?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=AD=A3=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java
index ccf77fd3..9d5b3771 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java
@@ -51,7 +51,7 @@ public class SarPublicIdeaServiceImpl extends ServiceImpl<SarPublicIdeaDao, SarP
                 .like(StringUtils.isNotEmpty(cname),"cname",cname)
                 .ge(start!=null,"start_time",start)
                 .le(end!=null,"end_time",end)
-                .orderByDesc("start_time");
+                .orderByAsc("end_time");
         Page<SarPublicIdea> page = new Page<>(p,size);
         IPage<SarPublicIdea> userIPage = sarPublicIdeaDao.selectPage(page, list);
         System.out.println("总条数"+userIPage.getTotal());

From d679b4829972fb3579f70462065ee669431aae40 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Fri, 27 Aug 2021 18:00:24 +0800
Subject: [PATCH 2/2] feat: There is no way the linux convert path

---
 .../main/java/com/adc/da/convert/common/DocConverterPdf.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/adc-da-convert/src/main/java/com/adc/da/convert/common/DocConverterPdf.java b/adc-da-convert/src/main/java/com/adc/da/convert/common/DocConverterPdf.java
index 697cf89e..d7840550 100644
--- a/adc-da-convert/src/main/java/com/adc/da/convert/common/DocConverterPdf.java
+++ b/adc-da-convert/src/main/java/com/adc/da/convert/common/DocConverterPdf.java
@@ -69,7 +69,7 @@ public class DocConverterPdf {
     /**
      * openOffice目录，window 可能在C://Program Files (x86)//OpenOffice 4
      */
-    private static final String openOfficeHome = "E://Software//rtpro//Foton//File//openOffice//4";
+    private static final String openOfficeHome = "/opt/openoffice4";
 
     /**
      * openOffice端口