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
6f0e60b3
Commit
6f0e60b3
authored
Oct 29, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.16' into MVP1.7.16
parents
3f153b86
67df314a
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
1 deletion
+13
-1
TAutoMainRelServiceImpl.java
...1/yifu/archives/service/impl/TAutoMainRelServiceImpl.java
+13
-1
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TAutoMainRelServiceImpl.java
View file @
6f0e60b3
...
...
@@ -841,6 +841,7 @@ public class TAutoMainRelServiceImpl extends ServiceImpl<TAutoMainRelMapper, TAu
//保存社保规则明细
if
(
Common
.
isNotNull
(
socialRuleRels
)){
TAutoSocialRuleRel
temp
=
null
;
for
(
TAutoSocialRuleRel
rel:
socialRuleRels
){
//存在新增的直接socialFlag =true 后面不在判断此种场景
if
(!
Common
.
isNotNull
(
rel
.
getId
())){
...
...
@@ -852,8 +853,19 @@ public class TAutoMainRelServiceImpl extends ServiceImpl<TAutoMainRelMapper, TAu
rel
.
setCreateBy
(
user
.
getId
());
rel
.
setCreateTime
(
LocalDateTime
.
now
());
rel
.
setCreateName
(
user
.
getNickname
());
if
(
Common
.
isNotNull
(
rel
.
getId
())){
temp
=
autoSocialRuleRelMapper
.
selectById
(
rel
.
getId
());
if
(
null
!=
temp
){
autoSocialRuleRelMapper
.
updateById
(
rel
);
}
else
{
autoSocialRuleRelMapper
.
insert
(
rel
);
}
}
else
{
autoSocialRuleRelMapper
.
insert
(
rel
);
}
}
}
// 判断数据对象是否都在页面传的对象里,有不在的数据,则返回true 目的是判断是否更新了
socialFlag
=
checkSocialRuleRelForNotIn
(
socialRuleRelsOld
,
socialRuleRels
);
...
...
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