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
a812c4ac
Commit
a812c4ac
authored
Jan 16, 2023
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化修改
parent
a6e41457
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
TVacationInfoServiceImpl.java
...iness/service/vacation/impl/TVacationInfoServiceImpl.java
+3
-3
No files found.
yifu-business/yifu-business-biz/src/main/java/com/yifu/cloud/plus/v1/business/service/vacation/impl/TVacationInfoServiceImpl.java
View file @
a812c4ac
...
...
@@ -168,9 +168,6 @@ implements TVacationInfoService {
}
if
(!
CollUtil
.
isEmpty
(
list
))
{
errorMessageList
.
addAll
(
Common
.
commonImportErrorMessage
(
list
));
if
(!
errorMessageList
.
isEmpty
())
{
return
R
.
failed
(
errorMessageList
,
"数据校验失败"
);
}
List
<
TBusinessEmployeeExtendInfo
>
employeeExtentList
=
new
ArrayList
<>();
List
<
TBusDept
>
busDeptList
=
busDeptService
.
list
();
R
<
TBusinessDataListVo
>
sdRes
=
archivesDaprUtil
.
getAllExtendList
();
...
...
@@ -214,6 +211,9 @@ implements TVacationInfoService {
}
TBusDept
busDept
=
busDeptMap
.
get
(
businessEmployeeExtend
.
getDepartName
());
boolean
isSave
=
true
;
if
(!
errorMessageList
.
isEmpty
()
&&
errorMessageList
.
stream
().
allMatch
(
e
->
e
.
getLineNum
()
==
line
))
{
continue
;
}
if
(
Common
.
isEmpty
(
sysMap
.
get
(
dto
.
getVacationType
())))
{
errorMessageList
.
add
(
new
ErrorMessage
(
line
,
BusinessResultErrorMsg
.
VACATION_TYPE_DATA_NOT_EXIST
,
CommonConstants
.
RED
));
isSave
=
false
;
...
...
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