修改 联动单位分页列表异常

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/LinkageUnitMapper.java

 package com.yeejoin.amos.boot.module.common.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.common.api.dto.LinkageUnitDto;
 import com.yeejoin.amos.boot.module.common.api.dto.LinkageUnitZhDto;
 import com.yeejoin.amos.boot.module.common.api.dto.RequestData;
@@ -55,7 +57,7 @@ public interface LinkageUnitMapper extends BaseMapper<LinkageUnit> {
      * 查询包含特岗人数及的具体信息
      * @return
      */
-    List<LinkageUnitDto> getEmergencyLinkageUnitList(String unitName,
+    Page<List<LinkageUnitDto>> getEmergencyLinkageUnitList(IPage<LinkageUnitDto> page,String unitName,
 			 String linkageUnitTypeCode,  String emergencyLinkageUnitCode);
 
     List<LinkageUnitDto> exportToExcel();

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/LinkageUnitMapper.xml

@@ -132,7 +132,7 @@
 
 
 	<select id="getEmergencyLinkageUnitList"
-		resultType="com.yeejoin.amos.boot.module.common.api.dto.LinkageUnitDto">
+		resultType="java.util.Map">
 		SELECT
 		clu.sequence_nbr as sequenceNbr,
 		clu.unit_name as unitName,

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/LinkageUnitServiceImpl.java

@@ -75,8 +75,8 @@ public class LinkageUnitServiceImpl extends BaseService<LinkageUnitDto, LinkageU
 			@Condition(Operator.eq) Boolean isDelete, @Condition(Operator.like) String unitName,
 			@Condition(Operator.eq) String linkageUnitTypeCode, @Condition(Operator.eq) String emergencyLinkageUnitCode,
 			String inAgreement) {
-		List<LinkageUnitDto>  linkageUnitList = linkageUnitMapper.getEmergencyLinkageUnitList(unitName, linkageUnitTypeCode, emergencyLinkageUnitCode);
-		List<Map> linkageUnitListMap =JSONArray.parseArray(JSONArray.toJSONString(linkageUnitList), Map.class);
+		Page<List<LinkageUnitDto>> linkageUnitList = linkageUnitMapper.getEmergencyLinkageUnitList(page,unitName, linkageUnitTypeCode, emergencyLinkageUnitCode);
+		List<Map> linkageUnitListMap =JSONArray.parseArray(JSONArray.toJSONString(linkageUnitList.getRecords()), Map.class);
 		
 		List<Map<String, Object>> pageList = dynamicFormInstanceService.listAll(getGroupCode());
 		linkageUnitListMap.forEach(i -> {
@@ -87,7 +87,7 @@ public class LinkageUnitServiceImpl extends BaseService<LinkageUnitDto, LinkageU
 				}
 			});
 		});
-		List<LinkageUnitDto> resultDtoList = JSONArray.parseArray(JSONArray.toJSONString(linkageUnitList),
+		List<LinkageUnitDto> resultDtoList = JSONArray.parseArray(JSONArray.toJSONString(linkageUnitList.getRecords()),
 				LinkageUnitDto.class);
 		List<LinkageUnitDto> detaiList = resultDtoList.stream().map(item -> {
 			Date now = new Date();
@@ -103,7 +103,7 @@ public class LinkageUnitServiceImpl extends BaseService<LinkageUnitDto, LinkageU
 		Page<LinkageUnitDto> page1 = new Page<LinkageUnitDto>();
 		page1.setCurrent(page.getCurrent());
 		page1.setSize(page.getSize());
-		page1.setTotal(linkageUnitList.size()); // TOTAL 需要统计所有存在的数据BUG2590 by kongfm
+		page1.setTotal(linkageUnitList.getTotal()); // TOTAL 需要统计所有存在的数据BUG2590 by kongfm
 		page1.setRecords(detaiList);
 		return page1;
 	}