From c7a4342694051ae050f5307949bf54d43b997719 Mon Sep 17 00:00:00 2001 From: hokli <2629910752@qq.com> Date: Fri, 3 Oct 2025 16:56:50 +0800 Subject: [PATCH] null --- .../admin/mapper/OfficialGoldRecordMapperExpand.java | 2 +- .../admin/service/record/OfficialGoldRecordService.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/OfficialGoldRecordMapperExpand.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/OfficialGoldRecordMapperExpand.java index 994807a85..b3f20c3df 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/OfficialGoldRecordMapperExpand.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/OfficialGoldRecordMapperExpand.java @@ -50,7 +50,7 @@ public interface OfficialGoldRecordMapperExpand { List getOfficialGoldRecordList(@Param("record") Map record, @Param("start") Integer start, @Param("pageSize") Integer pageSize); int getOfficialGoldRecordCount(@Param("record") Map record); - long getTotalNum(@Param("record") Map record); + Long getTotalNum(@Param("record") Map record); BigDecimal getTotalAmountByAdminId(@Param("`type`") Byte type, @Param("adminId") Integer adminId, diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/record/OfficialGoldRecordService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/record/OfficialGoldRecordService.java index 83122a4c5..35fb25ea2 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/record/OfficialGoldRecordService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/record/OfficialGoldRecordService.java @@ -3,8 +3,8 @@ package com.accompany.admin.service.record; import cn.hutool.core.util.StrUtil; import com.accompany.admin.mapper.OfficialGoldRecordMapper; import com.accompany.admin.mapper.OfficialGoldRecordMapperExpand; -import com.accompany.admin.model.OfficialGoldRecord; import com.accompany.admin.model.AdminUser; +import com.accompany.admin.model.OfficialGoldRecord; import com.accompany.admin.service.system.AdminUserService; import com.accompany.admin.vo.OfficialGoldAllRecordVo; import com.accompany.admin.vo.OfficialGoldRecordVo; @@ -589,10 +589,10 @@ public class OfficialGoldRecordService extends BaseService { vo.setCurrencyTypeDesc(currencyTypeDesc); } int count = officialGoldRecordMapperExpand.getOfficialGoldRecordCount(record); - long totalNum = officialGoldRecordMapperExpand.getTotalNum(record); + Long totalNum = officialGoldRecordMapperExpand.getTotalNum(record); data.put("rows", list); data.put("total", count); - data.put("totalNum", totalNum); + data.put("totalNum", totalNum == null ? 0L : totalNum); return data; }