|
@@ -109,7 +109,7 @@ public class AuthInfoServiceImpl implements AuthInfoService {
|
|
@Override
|
|
@Override
|
|
public void appHasExpired(String code) {
|
|
public void appHasExpired(String code) {
|
|
BasicSchool basicSchool = commonCacheService.schoolCache(code);
|
|
BasicSchool basicSchool = commonCacheService.schoolCache(code);
|
|
- if ((Objects.nonNull(basicSchool) && Objects.nonNull(basicSchool.getEnable()) && basicSchool.getEnable() == false)
|
|
|
|
|
|
+ if ((Objects.nonNull(basicSchool) && Objects.nonNull(basicSchool.getEnable()) && !basicSchool.getEnable())
|
|
|| (Objects.isNull(solarService.getAppInfo()) || solarService.getAppInfo().getControl().hasExpired())
|
|
|| (Objects.isNull(solarService.getAppInfo()) || solarService.getAppInfo().getControl().hasExpired())
|
|
|| (Objects.isNull(solarService.getAppControl()) || solarService.getAppControl().hasExpired())) {
|
|
|| (Objects.isNull(solarService.getAppControl()) || solarService.getAppControl().hasExpired())) {
|
|
throw ExceptionResultEnum.AUTH_INFO_ERROR.exception();
|
|
throw ExceptionResultEnum.AUTH_INFO_ERROR.exception();
|