|
@@ -207,10 +207,10 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
|
|
|
}
|
|
|
}
|
|
|
UserTenantAlbumRecord record = userTenantAlbumRecordService.lambdaQuery()
|
|
|
- .eq(UserTenantAlbumRecord::getTenantId, tenantInfo.getId())
|
|
|
.eq(UserTenantAlbumRecord::getUserId, detail.getUserId())
|
|
|
.eq(UserTenantAlbumRecord::getClientType, ClientEnum.STUDENT)
|
|
|
- .orderByDesc(UserTenantAlbumRecord::getEndTime)
|
|
|
+ .gt(UserTenantAlbumRecord::getEndTime,new Date())
|
|
|
+ .orderByAsc(UserTenantAlbumRecord::getEndTime)
|
|
|
.last("limit 1").one();
|
|
|
if (record == null || record.getEndTime().getTime() < System.currentTimeMillis()) {
|
|
|
studentHomeVo.setTenantAlbumFlag(YesOrNoEnum.NO);
|