1

gx_api/GxPress/Repository/GxPress.Repository.Implement/Note/NoteRepository.cs

@@ -802,7 +802,7 @@ namespace GxPress.Repository.Implement.Note
                                             FROM
                                                 tede_middle
                                             WHERE
-                                                MiddleId = a.Id AND FolderType = {noteConstValue})) AS FolderName,
+                                                MiddleId = a.Id AND FolderType = {noteConstValue} limit 1)) AS FolderName,
                                 (SELECT 
                                         Id
                                     FROM
@@ -813,7 +813,7 @@ namespace GxPress.Repository.Implement.Note
                                             FROM
                                                 tede_middle
                                             WHERE
-                                                MiddleId = a.Id AND FolderType = {noteConstValue})) AS FolderId,
+                                                MiddleId = a.Id AND FolderType = {noteConstValue} limit 1)) AS FolderId,
                                 (SELECT 
                                         COUNT(1)
                                     FROM

gx_api/GxPress/Repository/GxPress.Repository.Implement/WorkMeeting/MeetingRepository.cs

@@ -70,7 +70,7 @@ namespace GxPress.Repository.Implement.WorkMeeting
             var sql = $@"select * from tede_meeting where Id in( select MeetingSummaryId from  tede_meeting_summary_todo  where TypeId=1 and UserId={userId}) and EndDateTime<'{DateTime.Now}'";
             if (!string.IsNullOrWhiteSpace(keyword))
                 sql += $" and (Name like '%{keyword}%' or Description like '%{keyword}%')";
-            sql += $" limit {(page - 1) * perPage},{perPage}";
+            sql += $" order by StartDateTime desc limit {(page - 1) * perPage},{perPage}";
             var databaseType = StringUtils.ToEnum<DatabaseType>(_databaseTypeStr, DatabaseType.MySql);
             var database = new Database(databaseType, _connectionString);
             var connection = database.GetConnection();

gx_api/GxPress/Service/GxPress.Service.Implement/Topic/TopicService.cs

@@ -661,6 +661,16 @@ namespace GxPress.Service.Implement.Topic
                     item.Data = new List<ContentJsonData>();
                 if (item.Title == null)
                     item.Title = string.Empty;
+                if (item.Data != null)
+                {
+                    foreach (var data in item.Data)
+                    {
+                        if (!string.IsNullOrEmpty(data.Title))
+                            data.Title = string.Empty;
+                        if (!string.IsNullOrEmpty(data.FileName))
+                            data.FileName = string.Empty;
+                    }
+                }
             }
             //查询系统默认的公开文件夹是否存在
             var query = Q.NewQuery();