From 9a650afc7dbba2ff48272f32a2e5c077559c36ce Mon Sep 17 00:00:00 2001 From: xupei Date: Tue, 26 Aug 2025 14:10:28 +0800 Subject: [PATCH] =?UTF-8?q?TASK:=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=AD=90=E8=B4=A6=E5=8F=B7design=E8=AF=95=E7=94=A8=E9=A2=91?= =?UTF-8?q?=E6=AC=A1=EF=BC=8C=E6=A0=B9=E6=8D=AE=E7=AE=A1=E7=90=86=E5=91=98?= =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E9=99=90=E5=AE=9A=E6=9F=A5=E8=AF=A2=E8=8C=83?= =?UTF-8?q?=E5=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ai/da/mapper/primary/AccountMapper.java | 6 ++++-- .../ai/da/service/impl/ConvenientInquiryServiceImpl.java | 4 ++-- src/main/resources/mapper/primary/AccountMapper.xml | 6 ++++++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/ai/da/mapper/primary/AccountMapper.java b/src/main/java/com/ai/da/mapper/primary/AccountMapper.java index 65d6e8fe..f27904da 100644 --- a/src/main/java/com/ai/da/mapper/primary/AccountMapper.java +++ b/src/main/java/com/ai/da/mapper/primary/AccountMapper.java @@ -32,8 +32,10 @@ public interface AccountMapper extends CommonMapper { void toVisitor(Long id); - List selectCreditUsage(boolean groupByEvent, String changeEvent, String role, String userEmail, Long id, String startTime, String endTime, Integer size, Integer offset); + List selectCreditUsage(boolean groupByEvent, String changeEvent, String role, + String userEmail, Long id, String startTime, String endTime, + Integer size, Integer offset, String organizationName); - int countCreditUsage(boolean groupByEvent, String changeEvent, String role, String userEmail, Long id, String startTime, String endTime); + int countCreditUsage(boolean groupByEvent, String changeEvent, String role, String userEmail, Long id, String startTime, String endTime, String organizationName); } diff --git a/src/main/java/com/ai/da/service/impl/ConvenientInquiryServiceImpl.java b/src/main/java/com/ai/da/service/impl/ConvenientInquiryServiceImpl.java index 4fb8121c..d9f23c23 100644 --- a/src/main/java/com/ai/da/service/impl/ConvenientInquiryServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/ConvenientInquiryServiceImpl.java @@ -883,11 +883,11 @@ public class ConvenientInquiryServiceImpl extends ServiceImpl creditsUsageDTOS = accountMapper.selectCreditUsage( groupByEvent, queryDTO.getChangeEvent(), role, queryDTO.getUserEmail(), queryDTO.getId(), - queryDTO.getStartTime(), queryDTO.getEndTime(), size, offset); + queryDTO.getStartTime(), queryDTO.getEndTime(), size, offset, account.getOrganizationName()); if (!creditsUsageDTOS.isEmpty()){ int total = accountMapper.countCreditUsage( groupByEvent, queryDTO.getChangeEvent(), role, queryDTO.getUserEmail(), queryDTO.getId(), - queryDTO.getStartTime(), queryDTO.getEndTime()); + queryDTO.getStartTime(), queryDTO.getEndTime(), account.getOrganizationName()); // 总页数 double totalPage = Math.ceil((double) total / size); // 组装返回参数 diff --git a/src/main/resources/mapper/primary/AccountMapper.xml b/src/main/resources/mapper/primary/AccountMapper.xml index c21f0c6b..a6f75c3d 100644 --- a/src/main/resources/mapper/primary/AccountMapper.xml +++ b/src/main/resources/mapper/primary/AccountMapper.xml @@ -84,6 +84,9 @@ a.system_user IN (0, 1, 2, 3, 4) + + AND a.organization_name = #{organizationName} + AND a.id = #{id} @@ -126,6 +129,9 @@ a.system_user IN (0, 1, 2, 3, 4) + + AND a.organization_name = #{organizationName} + AND a.user_email = #{userEmail}