From 9f0ed138743b90ad2b64f06878fa2cab2c74459d Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Thu, 12 Aug 2021 18:08:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E8=A7=84=E8=AF=84=E4=BC=B0=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E6=95=B0=E6=8D=AE=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SarStandProjectLibraryController.java            | 2 +-
 .../service/impl/SarStandProjectLibraryServiceImpl.java         | 2 +-
 .../sarStandProjectLibrary/SarStandProjectLibraryMapper.xml     | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java
index dfe3556c..434f18b6 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java
@@ -54,7 +54,7 @@ public class SarStandProjectLibraryController extends BaseController<SarStandPro
     @ApiOperation("车型/项目库")
     public ResponseMessage queryMaintenanceProjectWorkFlow(@RequestParam(defaultValue = "1", value = "Page")int Page, @RequestParam(defaultValue = "10", value = "PageSize") int PageSize,
                                                    SarStandProjectLibraryDto sarDto) {
-        IPage<SarStandProjectLibrary> MaintenanceList = sarStandProjectLibraryService.queryMaintenanceProject(Page,PageSize,sarDto);
+        IPage<SarStandProjectLibrary> MaintenanceList = sarStandProjectLibraryService.queryMaintenanceProjectWorkFlow(Page,PageSize,sarDto);
         Map<String, Object> map = new HashMap<String, Object>();
         map.put("Maintenance",MaintenanceList);
         return Result.success("200",map);
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java
index db421951..1f6587de 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java
@@ -289,7 +289,7 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
     private IPage<SarStandProjectLibrary> getSarStandProjectLibraryIPage(int current, int pageSize,SarStandProjectLibrary wrapper,int flag) {
         Page<SarStandProjectLibrary> page = new Page<>(current, pageSize);
         IPage<SarStandProjectLibrary> userIPage = new Page<>();
-        if (!"3".equals(flag)) {
+        if (3!=flag) {
             List<SarStandProjectLibrary> sarStandProjectLibraries = sarStandProjectLibraryDao.selectPages(current, pageSize, wrapper, flag);
             Integer count = sarStandProjectLibraryDao.selectCount(wrapper, flag);
             userIPage.setCurrent(current);
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml
index 939fb13e..204983ac 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml
@@ -247,6 +247,5 @@
             </if>
         </if>
         )
-        limit ${(page-1)*size},${page*size}
     </select>
 </mapper>