1

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

@@ -419,7 +419,7 @@ namespace GxPress.Repository.Implement.Note
                         sql += "and  (a.RoleId in(1,3))";
                 }
                 if (request.FolderId == 0 && !string.IsNullOrEmpty(request.SearchKey))
-                    sql += $@" AND (b.Title LIKE '%{request.SearchKey}%' OR a.FolderName LIKE '%{request.SearchKey}%' or b.TextContent LIKE '%{request.SearchKey}%' or b.UserId in (select Id from tede_user where name like '%{request.SearchKey}%'))";
+                    sql += $@" AND (b.Title LIKE '%{request.SearchKey}%' OR a.FolderName LIKE '%{request.SearchKey}%' or b.TextContent LIKE '%{request.SearchKey}%')";
                 else if (!string.IsNullOrEmpty(request.SearchKey))
                     sql += $@" and a.ParentId={request.FolderId}  AND(b.Title LIKE '%{request.SearchKey}%' OR a.FolderName LIKE '%{request.SearchKey}%' or b.TextContent LIKE '%{request.SearchKey}%')";
                 else
@@ -483,7 +483,7 @@ namespace GxPress.Repository.Implement.Note
                         sql += "and  (a.RoleId in(1,3))";
                 }
                 if (request.FolderId == 0 && !string.IsNullOrEmpty(request.SearchKey))
-                    sql += $@" and a.ParentId={request.FolderId}  AND(b.Title LIKE '%{request.SearchKey}%' OR a.FolderName LIKE '%{request.SearchKey}%' or b.TextContent LIKE '%{request.SearchKey}%' or b.UserId in (select Id from tede_user where name like '%{request.SearchKey}%'))";
+                    sql += $@" and a.ParentId={request.FolderId}  AND(b.Title LIKE '%{request.SearchKey}%' OR a.FolderName LIKE '%{request.SearchKey}%' or b.TextContent LIKE '%{request.SearchKey}%')";
                 else if (!string.IsNullOrEmpty(request.SearchKey))
                     sql += $@" and a.ParentId={request.FolderId}  AND(b.Title LIKE '%{request.SearchKey}%' OR a.FolderName LIKE '%{request.SearchKey}%' or b.TextContent LIKE '%{request.SearchKey}%')";
                 else
@@ -503,9 +503,9 @@ namespace GxPress.Repository.Implement.Note
                         sql += " and  (a.RoleId in(1,3))";
                 }
                 if (request.FolderId == 0 && !string.IsNullOrEmpty(request.SearchKey))
-                    sql += $@" and a.ParentId={request.FolderId} AND(b.Title LIKE '%{request.SearchKey}%' OR a.FolderName LIKE '%{request.SearchKey}%' or b.TextContent LIKE '%{request.SearchKey}%' or b.UserId in (select Id from tede_user where name like '%{request.SearchKey}%'))";
+                    sql += $@" and a.ParentId={request.FolderId} AND(b.Title LIKE '%{request.SearchKey}%' OR a.FolderName LIKE '%{request.SearchKey}%' or b.TextContent LIKE '%{request.SearchKey}%')";
                 else if (!string.IsNullOrEmpty(request.SearchKey))
-                    sql += $@" and a.ParentId={request.FolderId}  AND(b.Title LIKE '%{request.SearchKey}%' OR a.FolderName LIKE '%{request.SearchKey}%' or b.TextContent LIKE '%{request.SearchKey}%' or b.UserId in (select Id from tede_user where name like '%{request.SearchKey}%'))";
+                    sql += $@" and a.ParentId={request.FolderId}  AND(b.Title LIKE '%{request.SearchKey}%' OR a.FolderName LIKE '%{request.SearchKey}%' or b.TextContent LIKE '%{request.SearchKey}%')";
                 else
                     sql += $" and a.ParentId={request.FolderId}";
             }
@@ -697,7 +697,7 @@ namespace GxPress.Repository.Implement.Note
                                 a.IsTopic = 1";
             if (!string.IsNullOrEmpty(request.SearchKey))
             {
-                sql += $@"  and (b.Name like '%11%' or a.Title like '%11%' or a.TextContent like '%11%')";
+                sql += $@"  and (b.Name like '%{request.SearchKey}%' or a.Title like '%11%' or a.TextContent like '%{request.SearchKey}%')";
             }
             sql += $@" AND (a.FolderId IN (SELECT 
                                         Id

gx_api/GxPress/Service/GxPress.Service.Implement/Notice/NoticeService.cs

@@ -395,8 +395,7 @@ namespace GxPress.Service.Implement.Notice
             }
             else
             {
-                var searchList = new List<int> { 1, 2, 3 };
-                if (!searchList.Contains(request.SearchType))
+                if (request.SearchType == 0)
                     query.Where("tede_middle.ParentId", request.NoticeFolderId);
             }
             query.Where("tede_middle.IsRecall", false);
@@ -408,7 +407,7 @@ namespace GxPress.Service.Implement.Notice
             query = commonSqlKataService.NoticeQueryAsync(query, request.UserId);
             //通用
             query = commonSqlKataService.GetCommonQueryAsync(noticeTypeValue, request.UserId, query);
-            
+
             query.OrderByDesc("tede_middle.AttributeValue");
             query.OrderByDesc("tede_middle.IsTop");
             query.OrderByDesc("tede_middle.LastModifiedDate");