From 88ae1e650fc2fc30928edfe8f3cc39108d8d1ccd Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 06 五月 2026 15:44:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/basic/service/impl/CustomerPrivateServiceImpl.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/service/impl/CustomerPrivateServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/CustomerPrivateServiceImpl.java
index ae0ab05..4521155 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/CustomerPrivateServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/CustomerPrivateServiceImpl.java
@@ -49,7 +49,6 @@
private final SalesLedgerMapper salesLedgerMapper;
private final CustomerPrivateMapper customerPrivateMapper;
- private final CustomerPrivateService customerPrivateService;
@Override
@@ -89,7 +88,7 @@
@Override
public R importData(MultipartFile file) {
try {
- List<CustomerPrivate> existingList = customerPrivateService.list();
+ List<CustomerPrivate> existingList = customerPrivateMapper.selectList(null);
java.util.Set<String> existingCustomerNames = existingList.stream()
.map(CustomerPrivate::getCustomerName)
.collect(Collectors.toSet());
--
Gitblit v1.9.3