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}