diff --git a/src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java index e3091cbb..9d8fafba 100644 --- a/src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java +++ b/src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java @@ -648,7 +648,7 @@ public class UserServiceImpl extends ServiceImpl implements Us // 获取缓存的验证码 String email = form.getEmail(); - String redisCacheKey = RedisConstants.Captcha.EMAIL_CODE + email; + String redisCacheKey = StrUtil.format(RedisConstants.Captcha.EMAIL_CODE, email); String cachedVerifyCode = redisTemplate.opsForValue().get(redisCacheKey); if (StrUtil.isBlank(cachedVerifyCode)) { diff --git a/src/main/resources/mapper/system/UserNoticeMapper.xml b/src/main/resources/mapper/system/UserNoticeMapper.xml index 46332903..c3364cb0 100644 --- a/src/main/resources/mapper/system/UserNoticeMapper.xml +++ b/src/main/resources/mapper/system/UserNoticeMapper.xml @@ -21,6 +21,9 @@ AND t2.title LIKE CONCAT('%',#{queryParams.title},'%') + + AND t1.is_read = #{queryParams.isRead} + ORDER BY t2.publish_time DESC, t2.create_time DESC