From 5d8e14befe1ec7be7069db2394c5c4bb7a5a89ee Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Wed, 8 Sep 2021 10:09:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E5=8D=95=20=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E5=9B=9E=E9=80=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/adc/da/slrs/DataSync/DataSyncController.java     | 4 +++-
 .../resources/mybatis/mapper/sarPosition/TsPositionMapper.xml | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/DataSyncController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/DataSyncController.java
index b7cefcd3..4ca8c427 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/DataSyncController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/DataSyncController.java
@@ -17,6 +17,7 @@ import com.adc.da.sys.service.IOrgEOService;
 import com.adc.da.sys.service.impl.OrgEOServiceImpl;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,7 +50,8 @@ public class DataSyncController {
         Map<String, String> positionMap = new HashMap<>();
         Map<String, String> useDistinct = new HashMap<>();
 
-        List<TsPosition> positions = tsPositionService.getPosition(new TsPosition());
+        IPage<TsPosition> iPage = tsPositionService.getPosition(new TsPosition());
+        List<TsPosition> positions=iPage.getRecords();
         if (!positions.isEmpty()) {
             positions.forEach(tsPosition -> {
                 positionMap.put(tsPosition.getName(), tsPosition.getId());
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarPosition/TsPositionMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarPosition/TsPositionMapper.xml
index 2c1b947f..59141adc 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarPosition/TsPositionMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarPosition/TsPositionMapper.xml
@@ -32,7 +32,9 @@
                 p.name like concat(concat('%',#{name}),'%')
             </if>
         </where>
+        <if test=" null!= pageSize  ">
         limit ${(current-1) * pageSize},${pageSize}
+        </if>
     </select>
 
     <select id="pageTotal" resultType="Long">