Commit 9efe9a18 authored by yanghao's avatar yanghao

fix: #793 【合包客户】11.合并客户,客户经理均为空,允许合并

parent 01258088
...@@ -379,17 +379,11 @@ public class CustomerController { ...@@ -379,17 +379,11 @@ public class CustomerController {
if (customerDOSaved == null) { if (customerDOSaved == null) {
throw exception(ErrorCodeConstants.CUSTOMER_SAVED_NOT_EXISTS); throw exception(ErrorCodeConstants.CUSTOMER_SAVED_NOT_EXISTS);
} }
if (customerDOSaved.getCustomerService() == null) {
throw exception(ErrorCodeConstants.CUSTOMER_SAVED_CUSTOMER_SERVICE_IS_NULL);
}
CustomerDO customerDODeleted = customerService.getById(par.getCustomerIdDeleted()); CustomerDO customerDODeleted = customerService.getById(par.getCustomerIdDeleted());
if (customerDODeleted == null) { if (customerDODeleted == null) {
throw exception(ErrorCodeConstants.CUSTOMER_DELETED_NOT_EXISTS); throw exception(ErrorCodeConstants.CUSTOMER_DELETED_NOT_EXISTS);
} }
if (customerDODeleted.getCustomerService() == null) { if (!Objects.equals(customerDOSaved.getCustomerService(), customerDODeleted.getCustomerService())) {
throw exception(ErrorCodeConstants.CUSTOMER_DELETED_CUSTOMER_SERVICE_IS_NULL);
}
if (!customerDOSaved.getCustomerService().equals(customerDODeleted.getCustomerService())) {
throw exception(ErrorCodeConstants.CUSTOMER_MERGE_CUSTOMER_SERVICE_NOT_SAME); throw exception(ErrorCodeConstants.CUSTOMER_MERGE_CUSTOMER_SERVICE_NOT_SAME);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment