Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
Project
Project
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
fangxinjiang
yifu-mvp
Commits
a47c9087
Commit
a47c9087
authored
Jul 07, 2023
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化修改
parent
616d01d4
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
8 deletions
+5
-8
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+5
-8
No files found.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
a47c9087
...
...
@@ -694,13 +694,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if
(
Common
.
isNotNull
(
dispatchMap
)){
dispatch
=
dispatchMap
.
get
(
excel
.
getEmpIdcard
());
if
(
Common
.
isNotNull
(
dispatch
)){
if
(
Common
.
isNotNull
(
empVo
))
{
if
(
Common
.
isNotNull
(
empVo
.
getContactAddress
())
&&
Common
.
isNotNull
(
excel
.
getContactAddress
())
&&
!
excel
.
getContactAddress
().
equals
(
empVo
.
getContactAddress
()))
{
dispatch
.
setContactAddress
(
empVo
.
getContactAddress
());
}
}
else
{
dispatch
.
setContactAddress
(
excel
.
getContactAddress
());
}
if
(
Common
.
isNotNull
(
social
)){
dispatch
.
setSocialId
(
social
.
getId
());
dispatch
.
setSocialHouseholdName
(
social
.
getSocialHouseholdName
());
...
...
@@ -1310,7 +1303,11 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if
(
Common
.
isEmpty
(
dispatch
.
getDispatchItem
())){
return
true
;
}
dispatch
.
setContactAddress
(
excel
.
getContactAddress
());
if
(
Common
.
isNotNull
(
empVo
)
&&
Common
.
isNotNull
(
empVo
.
getContactAddress
()))
{
dispatch
.
setContactAddress
(
empVo
.
getContactAddress
());
}
else
{
dispatch
.
setContactAddress
(
excel
.
getContactAddress
());
}
dispatch
.
setOrganName
(
user
.
getDeptName
());
dispatch
.
setCreateBy
(
user
.
getId
());
dispatch
.
setCreateTime
(
LocalDateTime
.
now
());
...
...
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