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
140df5d7
Commit
140df5d7
authored
Aug 19, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.14' into MVP1.7.14
parents
17076e38
cb365522
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
TEmployeeInfoServiceImpl.java
.../yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
+2
-2
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @
140df5d7
...
...
@@ -3209,14 +3209,14 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
if
(
Common
.
isNotNull
(
basicInfo
.
getEmpIdCard
())){
// 赋值紧急联系人信息
if
(
Common
.
isNotNull
(
contactMap
.
get
(
basicInfo
.
getEmpIdCard
()))){
if
(
Common
.
isNotNull
(
contactMap
)
&&
Common
.
isNotNull
(
contactMap
.
get
(
basicInfo
.
getEmpIdCard
()))){
TEmpContactInfo
contactInfo
=
contactMap
.
get
(
basicInfo
.
getEmpIdCard
());
basicInfo
.
setEmergencyContactName
(
contactInfo
.
getEmpName
());
basicInfo
.
setEmergencyContactRelation
(
contactInfo
.
getRelationType
());
basicInfo
.
setEmergencyContactPhone
(
contactInfo
.
getTel
());
}
// 赋值社保户
if
(
Common
.
isNotNull
(
socialFundMap
.
get
(
basicInfo
.
getEmpIdCard
()))){
if
(
Common
.
isNotNull
(
socialFundMap
)
&&
Common
.
isNotNull
(
socialFundMap
.
get
(
basicInfo
.
getEmpIdCard
()))){
basicInfo
.
setSocialHouseholdName
(
socialFundMap
.
get
(
basicInfo
.
getEmpIdCard
()));
}
}
...
...
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