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
dc870ead
Commit
dc870ead
authored
Mar 13, 2020
by
qwmqiuwenmin
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'developer' of
http://115.159.76.241/haoban3.0/haoban-manage3.0.git
into developer
parents
8803ac87
ab74805d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
BindApiServiceImpl.java
...n/manage/service/service/out/impl/BindApiServiceImpl.java
+2
-2
ClerkController.java
...com/gic/haoban/manage/web/controller/ClerkController.java
+1
-1
No files found.
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/BindApiServiceImpl.java
View file @
dc870ead
...
...
@@ -168,7 +168,7 @@ public class BindApiServiceImpl implements BindApiService {
for
(
ClerkDTO
clerkDTO
:
list
){
clerkDTO
.
setPhoneNumber
(
staffDTO
.
getPhoneNumber
());
clerkDTO
.
setClerkName
(
staffDTO
.
getStaffName
());
clerkDTO
.
setHeadImgUrl
(
staffDTO
.
getHeadImg
());
clerkDTO
.
setHeadImgUrl
(
StringUtils
.
isEmpty
(
staffDTO
.
getHeadImg
())?
""
:
staffDTO
.
getHeadImg
());
clerkService
.
updateClerk
(
clerkDTO
);
}
...
...
@@ -250,7 +250,7 @@ public class BindApiServiceImpl implements BindApiService {
for
(
ClerkDTO
clerkDTO
:
list
){
clerkDTO
.
setPhoneNumber
(
staffDTO
.
getPhoneNumber
());
clerkDTO
.
setClerkName
(
staffDTO
.
getStaffName
());
clerkDTO
.
setHeadImgUrl
(
StringUtils
.
isEmpty
(
staffDTO
.
getHeadImg
())?
""
:
staffDTO
.
getHeadImg
());
clerkDTO
.
setHeadImgUrl
(
StringUtils
.
isEmpty
(
staffDTO
.
getHeadImg
())?
"
--
"
:
staffDTO
.
getHeadImg
());
clerkService
.
updateClerk
(
clerkDTO
);
}
}
...
...
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/ClerkController.java
View file @
dc870ead
...
...
@@ -110,7 +110,7 @@ public class ClerkController extends WebBaseController{
for
(
ClerkDTO
clerkDTO
:
list
){
clerkDTO
.
setPhoneNumber
(
staffDTO
.
getPhoneNumber
());
clerkDTO
.
setClerkName
(
staffDTO
.
getStaffName
());
clerkDTO
.
setHeadImgUrl
(
staffDTO
.
getHeadImg
());
clerkDTO
.
setHeadImgUrl
(
StringUtils
.
isEmpty
(
staffDTO
.
getHeadImg
())?
""
:
staffDTO
.
getHeadImg
());
clerkService
.
updateClerk
(
clerkDTO
);
}
//清空gic原来的手机号
...
...
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