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
8ea513ab
Commit
8ea513ab
authored
Jan 26, 2026
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.19' into MVP1.7.19
parents
c1843c04
01844ec2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
1 deletion
+3
-1
EmployeeRegistrationLeaveServiceImpl.java
...sp/service/impl/EmployeeRegistrationLeaveServiceImpl.java
+3
-1
No files found.
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationLeaveServiceImpl.java
View file @
8ea513ab
...
...
@@ -1518,6 +1518,8 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
for
(
EmployeeRegistrationLeave
leave
:
leaveList
)
{
// 判断了不等于 空、无需处理、完成,再去查合同
if
(
judgeToQueryContract
(
isExit
,
doType
,
nowTime
,
leave
)
)
{
contractId
=
""
;
contractIdEnd
=
""
;
paramVo
=
new
BaseSearchVO
();
paramVo
.
setEmpIdCard
(
leave
.
getEmpIdcard
());
paramVo
.
setDeptNo
(
leave
.
getDeptNo
());
...
...
@@ -1591,7 +1593,7 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
if
(
null
!=
returnR
&&
Common
.
isNotNull
(
returnR
.
getData
()))
{
returnVo
=
returnR
.
getData
();
if
(
Common
.
isEmpty
(
returnVo
.
getResultIdTwo
()))
{
leave
.
setEmpProjectId
(
leave
.
getEmpIdOld
());
leave
.
setEmpProjectId
(
leave
.
getEmp
Project
IdOld
());
leave
.
setCloseRemarkEmpProject
(
closeRemark
);
leave
.
setDoStatusProject
(
CommonConstants
.
ONE_STRING
);
}
...
...
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