Sunyard/chsm-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
liulu 2024-10-31 13:47:22 +08:00
parent 2a2bf99239
commit f7dc9427ac
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
chsm-web-manage/src/main/java/com/sunyard/chsm/service/impl/KeyInfoServiceImpl.java
View File

@ -90,7 +90,7 @@ public class KeyInfoServiceImpl implements KeyInfoService {
LocalDateTime now = LocalDateTime.now(); LocalDateTime now = LocalDateTime.now();
LambdaQueryWrapper<KeyInfo> wrapper = new LambdaQueryWrapper<KeyInfo>() LambdaQueryWrapper<KeyInfo> wrapper = new LambdaQueryWrapper<KeyInfo>()
.eq(StringUtils.hasText(query.getKeyType()), KeyInfo::getKeyType, query.getKeyType()) .eq(StringUtils.hasText(query.getKeyType()), KeyInfo::getKeyType, query.getKeyType())
.eq(StringUtils.hasText(query.getStatus()), KeyInfo::getStatus, query.getStatus()) // .eq(StringUtils.hasText(query.getStatus()), KeyInfo::getStatus, query.getStatus())
// .eq(KeyInfo::getDeleted, false) // .eq(KeyInfo::getDeleted, false)
.orderByDesc(KeyInfo::getCreateTime); .orderByDesc(KeyInfo::getCreateTime);
if (StringUtils.hasText(query.getStatus())) { if (StringUtils.hasText(query.getStatus())) {
@ -101,6 +101,10 @@ public class KeyInfoServiceImpl implements KeyInfoService {
} else if (KeyStatus.EXPIRED == queryStatus) { } else if (KeyStatus.EXPIRED == queryStatus) {
wrapper.eq(KeyInfo::getStatus, KeyStatus.ENABLED.getCode()) wrapper.eq(KeyInfo::getStatus, KeyStatus.ENABLED.getCode())
.lt(KeyInfo::getExpiredTime, now); .lt(KeyInfo::getExpiredTime, now);
} else if (KeyStatus.ENABLED == queryStatus) {
wrapper.eq(KeyInfo::getStatus, KeyStatus.ENABLED.getCode())
.lt(KeyInfo::getEffectiveTime, now)
.gt(KeyInfo::getExpiredTime, now);
} else { } else {
wrapper.eq(KeyInfo::getStatus, query.getStatus()); wrapper.eq(KeyInfo::getStatus, query.getStatus());
} }