Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jiedao-api-boot-master
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lanbaoming
jiedao-api-boot-master
Commits
0074f59a
Commit
0074f59a
authored
Oct 17, 2024
by
yanghao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: #740 【客户】合并客户,客户经理不同,仍然无法提交,提示“不能在两个不同的客户经理名下”
parent
8bdc58d4
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
CustomerController.java
...ustomer/controller/admin/customer/CustomerController.java
+1
-1
No files found.
yudao-module-customer/yudao-module-customer-rest/src/main/java/cn/iocoder/yudao/module/customer/controller/admin/customer/CustomerController.java
View file @
0074f59a
...
...
@@ -389,7 +389,7 @@ public class CustomerController {
if
(
customerDODeleted
.
getCustomerService
()
==
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
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment