Merge branch 'dev-tiande-member' into dev-tiande

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/MemberShareRecordBiz.java

@@ -356,7 +356,7 @@ public class MemberShareRecordBiz extends BaseBiz<MemberShareRecordMapper, Membe
 		}
 	}
 
-	public ObjectRestResponse selectCountList(MemberShareRecordDto memberShareRecordDto) {
+	public ObjectRestResponse<PageDataVO<MemberShareRecordVo>> selectCountList(MemberShareRecordDto memberShareRecordDto) {
 		Query query = new Query(memberShareRecordDto);
 		PageDataVO<MemberShareRecordVo> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.selectCountList(query.getSuper()));
 		if (pageDataVO != null && pageDataVO.getData() != null) {
@@ -494,7 +494,8 @@ public class MemberShareRecordBiz extends BaseBiz<MemberShareRecordMapper, Membe
 	 * @throws Exception
 	 */
 	public void exportCountRecordList(HttpServletResponse httpServletResponse, MemberShareRecordDto memberShareRecordDto) throws Exception {
-		List<MemberShareRecordVo> memberShareRecordVoList = getAllCountRecord(memberShareRecordDto).getData();
+		memberShareRecordDto.setLimit(Integer.MAX_VALUE);
+		List<MemberShareRecordVo> memberShareRecordVoList = selectCountList(memberShareRecordDto).getData().getData();
 		if (memberShareRecordVoList != null) {
 			ExcelWriter writer = null;
 			try {
@@ -507,12 +508,12 @@ public class MemberShareRecordBiz extends BaseBiz<MemberShareRecordMapper, Membe
 				//处理数据
 				List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
 				if (memberShareRecordVoList != null && memberShareRecordVoList.size() > 0) {
-					for (MemberShareRecordVo memberShareRecord : memberShareRecordVoList) {
+					for (MemberShareRecordVo memberShareRecordVo : memberShareRecordVoList) {
 						Map<String, Object> map = new HashMap();
-						map.put("date", memberShareRecord.getDate());
-						map.put("levelName", memberShareRecord.getLevelName());
-						map.put("userNum", memberShareRecord.getUserNum());
-						map.put("totalAmount", memberShareRecord.getTotalAmount());
+						map.put("date", memberShareRecordVo.getDate());
+						map.put("levelName", memberShareRecordVo.getLevelName());
+						map.put("userNum", memberShareRecordVo.getUserNum());
+						map.put("totalAmount", memberShareRecordVo.getTotalAmount());
 						list.add(map);
 					}
 				}