|
|
@@ -161,11 +161,14 @@ public class VppCustomerServiceImpl implements VppCustomerService {
|
|
|
LambdaQueryWrapper<VppCustomer> dupWrapper = new LambdaQueryWrapper<>();
|
|
|
dupWrapper.eq(VppCustomer::getTenantId, tenantId)
|
|
|
.eq(VppCustomer::getDeleteFlag, VppAuditHelper.NOT_DELETED)
|
|
|
- .and(w -> w.eq(VppCustomer::getAccountNo, access.getAccountNo())
|
|
|
- .or().eq(VppCustomer::getCustomerName, access.getCustomerName()));
|
|
|
+ .and(w -> w.
|
|
|
+ // eq(VppCustomer::getAccountNo, access.getAccountNo())
|
|
|
+ // .or().
|
|
|
+ eq(VppCustomer::getCustomerName, access.getCustomerName()));
|
|
|
Integer dupCount = customerMapper.selectCount(dupWrapper);
|
|
|
if (dupCount != null && dupCount > 0) {
|
|
|
- throw new BusinessException("同租户下已存在相同电力户号或客户名称的客户!");
|
|
|
+ // throw new BusinessException("同租户下已存在相同电力户号或客户名称的客户!");
|
|
|
+ throw new BusinessException("租户下已存在相同名称的客户!");
|
|
|
}
|
|
|
|
|
|
access.setAccessStatus(ACCESS_PASSED);
|