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
08e94eaa
Commit
08e94eaa
authored
Jul 03, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huych-合同自动化代码提交
parent
a455812c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
EmployeeRegistrationPreServiceImpl.java
...ives/service/impl/EmployeeRegistrationPreServiceImpl.java
+2
-2
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/EmployeeRegistrationPreServiceImpl.java
View file @
08e94eaa
...
...
@@ -692,10 +692,10 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
return
R
.
failed
(
"未找到流程中或者在用的合同!"
);
}
//是否已签署为否需要判断是否在用或者流程中的合同
if
((
CommonConstants
.
ONE_STRING
.
equals
(
employeeContractPreVo
.
getContractFlag
())
||
Common
Constants
.
EMPTY_STRING
.
equals
(
employeeContractPreVo
.
getContractFlag
()))
&&
flag
)
{
if
((
CommonConstants
.
ONE_STRING
.
equals
(
employeeContractPreVo
.
getContractFlag
())
||
Common
.
isEmpty
(
employeeContractPreVo
.
getContractFlag
()))
&&
flag
)
{
return
R
.
failed
(
"该项目下存在在途/有效的合同数据,请“是否已签署合同”是否调整为“是”"
);
}
if
(
CommonConstants
.
ONE_STRING
.
equals
(
employeeContractPreVo
.
getContractFlag
())
||
Common
Constants
.
EMPTY_STRING
.
equals
(
employeeContractPreVo
.
getContractFlag
()))
{
if
(
CommonConstants
.
ONE_STRING
.
equals
(
employeeContractPreVo
.
getContractFlag
())
||
Common
.
isEmpty
(
employeeContractPreVo
.
getContractFlag
()))
{
initContractPreInfo
(
employeeRegistrationPre
,
employeeContractPreVo
,
user
,
id
);
employeeRegistrationPre
.
setEmployeeContractPre
(
employeeContractPreVo
);
}
else
{
...
...
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