Commit 0074f59a authored by yanghao's avatar yanghao

fix: #740 【客户】合并客户,客户经理不同,仍然无法提交,提示“不能在两个不同的客户经理名下”

parent 8bdc58d4
...@@ -389,7 +389,7 @@ public class CustomerController { ...@@ -389,7 +389,7 @@ public class CustomerController {
if (customerDODeleted.getCustomerService() == null) { if (customerDODeleted.getCustomerService() == null) {
throw exception(ErrorCodeConstants.CUSTOMER_DELETED_CUSTOMER_SERVICE_IS_NULL); throw exception(ErrorCodeConstants.CUSTOMER_DELETED_CUSTOMER_SERVICE_IS_NULL);
} }
if (customerDOSaved.getCustomerService() != customerDODeleted.getCustomerService()) { 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