Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
8
8timerapiv200
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
8timerv2
8timerapiv200
Commits
229f0a39
Commit
229f0a39
authored
4 years ago
by
leialin
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'lal' into 'develop'
提交 See merge request 8timerv2/8timerapiv200!352
parents
a3209075
36c70a39
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
3 deletions
+16
-3
src/main/java/cn/timer/api/controller/crm/CrmController.java
+16
-3
No files found.
src/main/java/cn/timer/api/controller/crm/CrmController.java
View file @
229f0a39
...
...
@@ -904,9 +904,22 @@ public class CrmController {
CrmClientData
crmClientData
=
CrmClientData
.
builder
().
id
(
cid
).
build
().
selectById
();
if
(
crmClientData
==
null
)
return
ResultUtil
.
error
(
"请确认该客户是否存在"
);
if
(!
crmClientData
.
getBelongUser
().
equals
(
empNum
)
&&
getGroupManager
(
crmClientData
.
getBelongGroup
(),
empNum
)
==
null
)
return
ResultUtil
.
error
(
"不是当前客户归属人或组管理员"
);
QyzxEmpEntAsso
ent
=
QyzxEmpEntAsso
.
builder
().
build
().
selectOne
(
new
QueryWrapper
<
QyzxEmpEntAsso
>().
lambda
().
eq
(
QyzxEmpEntAsso:
:
getOrgCode
,
userBean
.
getOrgCode
()).
eq
(
QyzxEmpEntAsso:
:
getEmpNum
,
userBean
.
getEmpNum
()));
if
(
ent
!=
null
)
{
if
(
ent
.
getUserType
()
==
2
)
{
if
(!
crmClientData
.
getBelongUser
().
equals
(
empNum
)
&&
getGroupManager
(
crmClientData
.
getBelongGroup
(),
empNum
)
==
null
)
return
ResultUtil
.
error
(
"不是当前客户归属人或组管理员"
);
}
}
// if (!crmClientData.getBelongUser().equals(empNum)
// && getGroupManager(crmClientData.getBelongGroup(), empNum) == null)
// return ResultUtil.error("不是当前客户归属人或组管理员");
Integer
status
=
crmClientData
.
getClientStatus
();
if
(
status
!=
null
&&
status
!=
5
)
{
crmClientData
.
setClientStatus
(
5
);
...
...
This diff is collapsed.
Click to expand it.
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