清单 流程回退

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());

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">