|
@@ -405,7 +405,11 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
|
|
|
.in(SysUserSub::getUserId, existUserIdList)
|
|
|
.in(SysUserSub::getCertStatus, Integer.valueOf(OladingCertStatus.CERT.getCode()))
|
|
|
.eq(SysUserSub::getCallbackStatus, GigCallBackStatus.RETURNED)
|
|
|
- .eq(SysUserSub::getGigType, GigTypeEnum.OLADING));
|
|
|
+ .and(wrapper -> {
|
|
|
+ wrapper.eq(SysUserSub::getGigType, GigTypeEnum.OLADING);
|
|
|
+ wrapper.or(wrapper1 -> wrapper1.eq(SysUserSub::getGigType, GigTypeEnum.YEE)
|
|
|
+ .eq(SysUserSub::getGigChannel, GigChannelEnum.JIN_YUAN));
|
|
|
+ }));
|
|
|
if (CollUtil.isNotEmpty(existUserSubList)) {
|
|
|
flag = false;
|
|
|
SysUserSub existUserSub = existUserSubList.get(0);
|