楚江ERP-客户池名称重复校验

@@ -113,6 +113,10 @@ public class CustomerServiceImpl extends BaseMpServiceImpl<CustomerMapper, Custo
     if (getBaseMapper().selectCount(checkWrapper) > 0) {
     if (getBaseMapper().selectCount(checkWrapper) > 0) {
       throw new DefaultClientException("编号重复，请重新输入！");
       throw new DefaultClientException("编号重复，请重新输入！");
     }
     }
+    Customer customer = this.getByName(vo.getName());
+    if (customer != null) {
+      throw new DefaultClientException("名称重复，请重新输入！");
+    }
 
 
     Customer data = new Customer();
     Customer data = new Customer();
     data.setId(IdUtil.getId());
     data.setId(IdUtil.getId());
@@ -191,6 +195,10 @@ public class CustomerServiceImpl extends BaseMpServiceImpl<CustomerMapper, Custo
     if (getBaseMapper().selectCount(checkWrapper) > 0) {
     if (getBaseMapper().selectCount(checkWrapper) > 0) {
       throw new DefaultClientException("编号重复，请重新输入！");
       throw new DefaultClientException("编号重复，请重新输入！");
     }
     }
+    Customer customer = this.getByName(vo.getName());
+    if (customer != null && !customer.getId().equals(vo.getId())) {
+      throw new DefaultClientException("名称重复，请重新输入！");
+    }
 
 
     LambdaUpdateWrapper<Customer> updateWrapper = Wrappers.lambdaUpdate(Customer.class)
     LambdaUpdateWrapper<Customer> updateWrapper = Wrappers.lambdaUpdate(Customer.class)
         .set(Customer::getCode, vo.getCode()).set(Customer::getName, vo.getName())
         .set(Customer::getCode, vo.getCode()).set(Customer::getName, vo.getName())

@@ -40,7 +40,7 @@ public class UpdateCustomerVo implements BaseVo, Serializable {
    * 简码
    * 简码
    */
    */
   @ApiModelProperty(value = "简码", required = true)
   @ApiModelProperty(value = "简码", required = true)
-  @NotBlank(message = "请输入简码！")
+//  @NotBlank(message = "请输入简码！")
   private String mnemonicCode;
   private String mnemonicCode;
 
 
   /**
   /**

@@ -43,7 +43,7 @@ public class CustomerCreditImportListener extends ExcelImportListener<CustomerCr
       Customer customer = customerService.getByName(data.getName());
       Customer customer = customerService.getByName(data.getName());
       if (customer == null) {
       if (customer == null) {
         throw new DefaultClientException(
         throw new DefaultClientException(
-                "第" + context.readRowHolder().getRowIndex() + "行“客户不存在”不能为空");
+                "第" + context.readRowHolder().getRowIndex() + "行“客户名称”不存在");
       } else {
       } else {
         data.setCompanyId(customer.getId());
         data.setCompanyId(customer.getId());
       }
       }