1

gx_api/GxPress/Model/GxPress.Result/App/Note/NoteResult.cs

@@ -154,7 +154,7 @@ namespace GxPress.Result.App.Note
         /// 用户姓名
         /// </summary>
         /// <value></value>
-        public string UserName { get; set; }
+        public string Name { get; set; }
         /// <summary>
         /// 用户Id
         /// </summary>

gx_api/GxPress/Repository/GxPress.Repository.Implement/GroupRepository.cs

@@ -172,7 +172,7 @@ namespace GxPress.Repository.Implement
             else
                 sql += $" and (a.FolderName like '%{request.Key}%' or b.Name like '%{request.Key}%')";
             sql +=
-                $@" and a.UserId=@userId and a.FolderType={groupConst} and a.IsDelete=0 {sqlValue} and (b.id>0 or a.AttributeValue=2) ORDER BY a.IsTop DESC, a.LastModifiedDate DESC ,a.AttributeValue DESC LIMIT  @page , @pageSize";
+                $@" and a.UserId=@userId and a.FolderType={groupConst} and a.IsDelete=0 {sqlValue} and (b.id>0 or a.AttributeValue=2) ORDER BY a.AttributeValue DESC,a.IsTop DESC, a.LastModifiedDate DESC  LIMIT  @page , @pageSize";
             var databaseType = StringUtils.ToEnum<DatabaseType>(_databaseTypeStr, DatabaseType.MySql);
             var database = new Database(databaseType, _connectionString);
             var connection = database.GetConnection();

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

@@ -667,7 +667,7 @@ namespace GxPress.Repository.Implement.Note
                       .QueryAsync<NoteNotFolderPageResult, User, NoteNotFolderPageResult>(sql,
                         (result, user) =>
                         {
-                            result.UserName = user == null ? "" : user.Name;
+                            result.Name = user == null ? "" : user.Name;
                             result.AvatarUrl = user == null ? "" : StringUtils.AddDomainMin(user.AvatarUrl);
                             return result;
                         }, splitOn: "Id,Name");