Merge remote-tracking branch 'origin/sandbox' into sandbox

# Conflicts:
#	src/main/java/cn/breeze/elleai/domain/sparring/service/ChatCompletionServiceImpl.java

src/main/java/cn/breeze/elleai/domain/sparring/service/ChatCompletionServiceImpl.java

@@ -54,6 +54,9 @@ public class ChatCompletionServiceImpl implements ChatCompletionService{
         if(StrUtil.isNotEmpty(request.getUserName())) {
             queryWrapper.where(USER_CHAT_COMPLETION_ENTITY.USER_NAME.eq(request.getUserName()));
         }
+        if(StrUtil.isNotEmpty(request.getUserId())) {
+            queryWrapper.and(USER_CHAT_COMPLETION_ENTITY.USER_ID.eq(request.getUserId()));
+        }
 
         if(StrUtil.isNotEmpty(request.getUserId())) {
             queryWrapper.where(USER_CHAT_COMPLETION_ENTITY.USER_ID.eq(request.getUserId()));