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
a2b0b8d9
Commit
a2b0b8d9
authored
Apr 02, 2026
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.21' into MVP1.7.21
parents
368f92df
bf6c747e
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+4
-4
TInsuranceDetailServiceImpl.java
...s/service/insurance/impl/TInsuranceDetailServiceImpl.java
+2
-2
No files found.
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
a2b0b8d9
...
@@ -2786,11 +2786,11 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -2786,11 +2786,11 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
.
map
(
R:
:
getMsg
)
.
map
(
R:
:
getMsg
)
.
orElse
(
"未知错误"
);
.
orElse
(
"未知错误"
);
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"访问员工基础服务异常:"
+
errorMsg
));
"访问员工基础服务异常:"
+
errorMsg
,
excel
));
continue
;
continue
;
}
}
if
(
null
==
domainR
.
getData
()){
if
(
null
==
domainR
.
getData
()){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"未查询到具体项目信息"
));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"未查询到具体项目信息"
,
excel
));
continue
;
continue
;
}
}
selectVo
=
domainR
.
getData
();
selectVo
=
domainR
.
getData
();
...
@@ -2798,13 +2798,13 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -2798,13 +2798,13 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
}
}
//判断项目是否可用 (务状态:0 正常 1 停止服务 2 冻结)
//判断项目是否可用 (务状态:0 正常 1 停止服务 2 冻结)
if
(!
CommonConstants
.
ZERO_STRING
.
equals
(
selectVo
.
getStopFlag
()))
{
if
(!
CommonConstants
.
ZERO_STRING
.
equals
(
selectVo
.
getStopFlag
()))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"项目不可用!"
));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"项目不可用!"
,
excel
));
continue
;
continue
;
}
}
//非管理员判断是否有项目权限
//非管理员判断是否有项目权限
if
(!
isAdmin
){
if
(!
isAdmin
){
if
(!
deptNos
.
contains
(
excel
.
getDeptNo
())){
if
(!
deptNos
.
contains
(
excel
.
getDeptNo
())){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"无项目权限!"
));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"无项目权限!"
,
excel
));
continue
;
continue
;
}
}
}
}
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java
View file @
a2b0b8d9
...
@@ -4524,8 +4524,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -4524,8 +4524,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
if
(
Optional
.
ofNullable
(
insuranceType
).
isPresent
())
{
if
(
Optional
.
ofNullable
(
insuranceType
).
isPresent
())
{
// param.setIsAdress(insuranceType.getIsAdress());
// param.setIsAdress(insuranceType.getIsAdress());
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
insuranceType
.
getAgeLimit
())
&&
(
IdCardUtil
.
getFullAge
(
param
.
getEmpIdcardNo
())
insuranceType
.
getAgeLimit
())
&&
(
IdCardUtil
.
getFullAge
(
param
.
get
Replace
EmpIdcardNo
())
<
CommonConstants
.
SIXTEEN_INT
||
IdCardUtil
.
getFullAge
(
param
.
getEmpIdcardNo
())
<
CommonConstants
.
SIXTEEN_INT
||
IdCardUtil
.
getFullAge
(
param
.
get
Replace
EmpIdcardNo
())
>
CommonConstants
.
SEVENTY
))
{
>
CommonConstants
.
SEVENTY
))
{
param
.
setErrorMessage
(
InsurancesConstants
.
REPLACE_EMP_AGE_NOT_LEGITIMATE
);
param
.
setErrorMessage
(
InsurancesConstants
.
REPLACE_EMP_AGE_NOT_LEGITIMATE
);
listResult
.
add
(
param
);
listResult
.
add
(
param
);
...
...
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