Commit f3949b6271a87c9f164846579e67384cd991504a
Merge remote-tracking branch 'origin/master_0929' into master_0929
Showing
1 changed file
with
1 additions
and
2 deletions
| @@ -25,8 +25,6 @@ public class CustomerCreditImportListener extends ExcelImportListener<CustomerCr | @@ -25,8 +25,6 @@ public class CustomerCreditImportListener extends ExcelImportListener<CustomerCr | ||
| 25 | private List<String> checkList = new ArrayList<>(); | 25 | private List<String> checkList = new ArrayList<>(); |
| 26 | private List<String> checkNameList = new ArrayList<>(); | 26 | private List<String> checkNameList = new ArrayList<>(); |
| 27 | 27 | ||
| 28 | - @Resource | ||
| 29 | - private CustomerCreditService customerCreditService; | ||
| 30 | 28 | ||
| 31 | @Override | 29 | @Override |
| 32 | protected void doInvoke(CustomerCreditImportModel data, AnalysisContext context) { | 30 | protected void doInvoke(CustomerCreditImportModel data, AnalysisContext context) { |
| @@ -57,6 +55,7 @@ public class CustomerCreditImportListener extends ExcelImportListener<CustomerCr | @@ -57,6 +55,7 @@ public class CustomerCreditImportListener extends ExcelImportListener<CustomerCr | ||
| 57 | QueryCustomerCreditVo vo = new QueryCustomerCreditVo(); | 55 | QueryCustomerCreditVo vo = new QueryCustomerCreditVo(); |
| 58 | vo.setCompanyId(customer.getId()); | 56 | vo.setCompanyId(customer.getId()); |
| 59 | vo.setStatusCancel("CANCEL"); | 57 | vo.setStatusCancel("CANCEL"); |
| 58 | + CustomerCreditService customerCreditService = ApplicationUtil.getBean(CustomerCreditService.class); | ||
| 60 | List<CustomerCredit> query = customerCreditService.query(vo); | 59 | List<CustomerCredit> query = customerCreditService.query(vo); |
| 61 | if (CollectionUtils.isNotEmpty(query) && query.size() > 0) { | 60 | if (CollectionUtils.isNotEmpty(query) && query.size() > 0) { |
| 62 | throw new DefaultClientException( | 61 | throw new DefaultClientException( |