1

gx_api/GxPress/Model/GxPress.Entity/User.cs

@@ -168,7 +168,7 @@ namespace GxPress.Entity
         [DataColumn]
         public bool IsVip { get; set; }
         /// <summary>
-        /// 会员类型 月卡 季卡 年卡
+        /// 会员类型 1月卡 2季卡 3年卡
         /// </summary>
         /// <value></value>
         [DataColumn]

gx_api/GxPress/Repository/GxPress.Repository.Implement/NoticeRepository.cs

@@ -365,7 +365,7 @@ namespace GxPress.Repository.Implement
                 if (!searchList.Contains(request.SearchType))
                     sb += " AND a.ParentId = " + request.NoticeFolderId;
             }
-            var noticeTypeValue = GxPress.EnumConst.AllTypeConst.Notice.GetHashCode();
+            var noticeTypeValue = GxPress.EnumConst.AllTypeConst.Inbox.GetHashCode();
             var sql = $@"SELECT a.*,(SELECT GROUP_CONCAT(SourceName Separator'、') from tede_user_middle where MiddleType=10 and DataSourceId=a.MiddleId) as EnjoyUser,(SELECT 
                             COUNT(1)
                         FROM
@@ -454,7 +454,7 @@ namespace GxPress.Repository.Implement
                                             left JOIN
                                         tede_addressee d ON d.Id = a.MiddleSonId
                                     WHERE
-                                        a.UserId = {request.UserId} and a.FolderType=1
+                                        a.UserId = {request.UserId} and a.FolderType={noticeTypeValue}
                                             {sb}
                                     ORDER BY a.IsTop desc,a.LastModifiedDate desc,a.AttributeValue desc
                                     LIMIT {(request.Page - 1) * request.PerPage},{request.PerPage}";
@@ -469,8 +469,8 @@ namespace GxPress.Repository.Implement
                                             left JOIN
                                         tede_addressee d ON d.Id = a.MiddleSonId
                                     WHERE
-                                        a.UserId = {1} and a.FolderType=1
-                                            {0}", sb, request.UserId);
+                                        a.UserId = {1} and a.FolderType={2}
+                                            {0}", sb, request.UserId,noticeTypeValue);
             var databaseType = StringUtils.ToEnum<DatabaseType>(_databaseTypeStr, DatabaseType.MySql);
             var database = new Database(databaseType, _connectionString);
             var connection = database.GetConnection();