Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
haoban-manage3.0
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
haoban3.0
haoban-manage3.0
Commits
7b2aae0e
Commit
7b2aae0e
authored
Mar 11, 2020
by
qwmqiuwenmin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
f775be94
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
0 deletions
+18
-0
DepartmentContoller.java
...gic/haoban/manage/web/controller/DepartmentContoller.java
+18
-0
No files found.
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/DepartmentContoller.java
View file @
7b2aae0e
...
...
@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSONArray
;
import
com.gic.api.base.commons.Page
;
import
com.gic.clerk.api.dto.ClerkDTO
;
import
com.gic.clerk.api.dto.ClerkListDTO
;
import
com.gic.clerk.api.service.ClerkService
;
import
com.gic.enterprise.api.dto.EnterpriseDTO
;
...
...
@@ -531,6 +532,7 @@ public class DepartmentContoller extends WebBaseController{
}
String
wxEnterpriseId
=
departmentDTO
.
getWxEnterpriseId
();
if
(
store
!=
null
){
String
enterpriseId
=
store
.
getEnterpriseId
();
List
<
ClerkListDTO
>
list
=
clerkService
.
getClerkByStoreId
(
store
.
getEnterpriseId
(),
storeId
);
logger
.
info
(
"【处理门店下导购】list={}"
,
JSON
.
toJSONString
(
list
));
for
(
ClerkListDTO
clerkListDTO
:
list
)
{
...
...
@@ -560,6 +562,14 @@ public class DepartmentContoller extends WebBaseController{
if
(
staffRelated
!=
null
&&
isCodeExist
==
null
){
staffRelated
.
setClerkCode
(
clerkCode
);
staffDepartmentRelatedApiService
.
updateById
(
staffRelated
);
ClerkDTO
clerkDTO
=
clerkService
.
getClerkByCodeNoStatus
(
enterpriseId
,
clerkCode
);
if
(
clerkDTO
!=
null
){
logger
.
info
(
"【员工修改】clerkDTO={}"
,
JSON
.
toJSONString
(
clerkDTO
));
clerkDTO
.
setClerkName
(
staff
.
getStaffName
());
clerkDTO
.
setPhoneNumber
(
staff
.
getPhoneNumber
());
clerkService
.
updateClerk
(
clerkDTO
);
}
}
}
}
else
{
...
...
@@ -577,6 +587,14 @@ public class DepartmentContoller extends WebBaseController{
//如果这个人是未绑定的 则绑定clerk
StaffDepartmentRelatedDTO
isCodeExist
=
staffApiService
.
getDepartmentIdAndCode
(
departmentId
,
clerkCode
);
if
(
StringUtils
.
isBlank
(
staffRelated
.
getClerkCode
())
&&
isCodeExist
==
null
){
ClerkDTO
clerkDTO
=
clerkService
.
getClerkByCodeNoStatus
(
enterpriseId
,
clerkCode
);
if
(
clerkDTO
!=
null
){
logger
.
info
(
"【员工修改】clerkDTO={}"
,
JSON
.
toJSONString
(
clerkDTO
));
clerkDTO
.
setClerkName
(
staff
.
getStaffName
());
clerkDTO
.
setPhoneNumber
(
staff
.
getPhoneNumber
());
clerkService
.
updateClerk
(
clerkDTO
);
}
staffRelated
.
setClerkCode
(
clerkCode
);
staffDepartmentRelatedApiService
.
updateById
(
staffRelated
);
}
...
...
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