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

community-service/src/main/java/com/tanpu/community/manager/ThemeManager.java

@@ -405,7 +405,7 @@ public class ThemeManager {
         List<ThemeEntity> themeEntities = Collections.emptyList();
         switch (req.getRecordType()) {
             case 1://发布
-                themeEntities = themeService.queryThemesByUserId(req.getUserId(), req.getLastId(), req.getPageSize());
+                themeEntities = themeService.queryThemesByUserIdCreateDesc(req.getUserId(), req.getLastId(), req.getPageSize());
                 break;
             case 2://回复
                 List<ThemeQo> commentThemeList = getCommentThemeQos(req, userId);

community-service/src/main/java/com/tanpu/community/service/ThemeService.java

@@ -77,7 +77,7 @@ public class ThemeService {
     }
 
     //根据用户id查询主题list
-    public List<ThemeEntity> queryThemesByUserId(String userId, String lastId, Integer pageSize) {
+    public List<ThemeEntity> queryThemesByUserIdCreateDesc(String userId, String lastId, Integer pageSize) {
         LambdaQueryWrapper<ThemeEntity> queryWrapper = new LambdaQueryWrapper<ThemeEntity>()
                 .eq(ThemeEntity::getAuthorId, userId)
                 .eq(ThemeEntity::getDeleteTag, DeleteTagEnum.NOT_DELETED.getCode())