|
@@ -485,10 +485,10 @@ public class GigSignCertReceiver extends BaseRabbiMqHandler<String> {
|
|
// .eq(SysUserSub::getCallbackStatus, GigCallBackStatus.IN_PROGRESS)
|
|
// .eq(SysUserSub::getCallbackStatus, GigCallBackStatus.IN_PROGRESS)
|
|
.eq(SysUserSub::getGigType, gigType));
|
|
.eq(SysUserSub::getGigType, gigType));
|
|
|
|
|
|
- // 过滤掉
|
|
|
|
|
|
+ // 过滤只要进心中 或 不是已认证的
|
|
List<SysUserSub> filterSubList = userSubList.stream()
|
|
List<SysUserSub> filterSubList = userSubList.stream()
|
|
- .filter(sub -> !GigCallBackStatus.IN_PROGRESS.equals(sub.getCallbackStatus())
|
|
|
|
- || ZhengQiZhiXingCertStatus.CERT.getCode() == sub.getCertStatus())
|
|
|
|
|
|
+ .filter(sub -> GigCallBackStatus.IN_PROGRESS.equals(sub.getCallbackStatus())
|
|
|
|
+ && ZhengQiZhiXingCertStatus.CERT.getCode() != sub.getCertStatus())
|
|
.collect(Collectors.toList());
|
|
.collect(Collectors.toList());
|
|
if (CollUtil.isEmpty(filterSubList)) {
|
|
if (CollUtil.isEmpty(filterSubList)) {
|
|
return;
|
|
return;
|