Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
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
项目统一框架
amos-boot-biz
Commits
143dce63
Commit
143dce63
authored
Aug 06, 2025
by
tianyiming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 添加空检查以避免设置空许可信息
parent
38a37ecf
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
12 deletions
+17
-12
DataHandlerServiceImpl.java
...ot/module/jg/biz/service/impl/DataHandlerServiceImpl.java
+8
-6
EnterpriseRefreshHandler.java
...ule/tcm/biz/refresh/handler/EnterpriseRefreshHandler.java
+9
-6
No files found.
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/DataHandlerServiceImpl.java
View file @
143dce63
...
...
@@ -1455,12 +1455,14 @@ public class DataHandlerServiceImpl {
BeanUtil
.
copyProperties
(
lis
,
esLicense
);
return
esLicense
;
}).
collect
(
Collectors
.
toList
());
esBaseEnterpriseInfo
.
setLicenses
(
licenses
);
try
{
esBaseEnterpriseInfo
.
setLicenseMinExpiryDate
(
RefreshCmService
.
getMinDateFromLicensesEp
(
licenses
));
esBaseEnterpriseInfo
.
setUnitType
(
onlineJyjc
?
enterpriseInfo
.
getUnitType
()
:
RefreshCmService
.
updateJyjcUnitType
(
enterpriseInfo
.
getUnitType
(),
licenses
));
}
catch
(
Exception
e
)
{
log
.
error
(
"企业信息单位类型或者取资质最小日期失败:{}"
,
enterpriseInfo
,
e
);
if
(!
ObjectUtils
.
isEmpty
(
licenses
))
{
esBaseEnterpriseInfo
.
setLicenses
(
licenses
);
try
{
esBaseEnterpriseInfo
.
setLicenseMinExpiryDate
(
RefreshCmService
.
getMinDateFromLicensesEp
(
licenses
));
esBaseEnterpriseInfo
.
setUnitType
(
RefreshCmService
.
updateJyjcUnitType
(
enterpriseInfo
.
getUnitType
(),
licenses
));
}
catch
(
Exception
e
)
{
log
.
error
(
"企业信息单位类型或者取资质最小日期失败:{}"
,
enterpriseInfo
,
e
);
}
}
return
esBaseEnterpriseInfo
;
}).
collect
(
Collectors
.
toList
());
...
...
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/refresh/handler/EnterpriseRefreshHandler.java
View file @
143dce63
...
...
@@ -22,6 +22,7 @@ import lombok.RequiredArgsConstructor;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.stereotype.Component
;
import
org.springframework.util.ObjectUtils
;
import
java.util.List
;
import
java.util.Optional
;
...
...
@@ -80,12 +81,14 @@ public class EnterpriseRefreshHandler implements IDataRefreshHandler {
BeanUtil
.
copyProperties
(
lis
,
esLicense
);
return
esLicense
;
}).
collect
(
Collectors
.
toList
());
esBaseEnterpriseInfo
.
setLicenses
(
licenses
);
try
{
esBaseEnterpriseInfo
.
setLicenseMinExpiryDate
(
RefreshCmService
.
getMinDateFromLicensesEp
(
licenses
));
esBaseEnterpriseInfo
.
setUnitType
(
onlineJyjc
?
enterpriseInfo
.
getUnitType
()
:
RefreshCmService
.
updateJyjcUnitType
(
enterpriseInfo
.
getUnitType
(),
licenses
));
}
catch
(
Exception
e
)
{
log
.
error
(
"企业信息单位类型或者取资质最小日期失败:{}"
,
enterpriseInfo
,
e
);
if
(!
ObjectUtils
.
isEmpty
(
licenses
))
{
esBaseEnterpriseInfo
.
setLicenses
(
licenses
);
try
{
esBaseEnterpriseInfo
.
setLicenseMinExpiryDate
(
RefreshCmService
.
getMinDateFromLicensesEp
(
licenses
));
esBaseEnterpriseInfo
.
setUnitType
(
RefreshCmService
.
updateJyjcUnitType
(
enterpriseInfo
.
getUnitType
(),
licenses
));
}
catch
(
Exception
e
)
{
log
.
error
(
"企业信息单位类型或者取资质最小日期失败:{}"
,
enterpriseInfo
,
e
);
}
}
enterpriseInfoDao
.
save
(
esBaseEnterpriseInfo
);
// 人员更新冗余的单位信息
...
...
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