1

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

@@ -106,7 +106,7 @@ namespace GxPress.Repository.Implement.Note
                     $@"SELECT a.*,(SELECT GROUP_CONCAT(SourceName Separator'、') from tede_user_middle where MiddleType=4 and DataSourceId=a.MiddleSonId) as EnjoyUser,(SELECT 
                     COUNT(1)
                 FROM
-                    ccpph.tede_analyze
+                    tede_analyze
                 WHERE
                     UserId = {request.UserId} AND TypeValue = 3
                         AND SourceId = a.MiddleId
@@ -114,7 +114,7 @@ namespace GxPress.Repository.Implement.Note
             (SELECT 
                     COUNT(1)
                 FROM
-                    ccpph.tede_analyze
+                    tede_analyze
                 WHERE
                     UserId = {request.UserId} AND TypeValue = 3
                         AND SourceId = a.MiddleId
@@ -123,14 +123,14 @@ namespace GxPress.Repository.Implement.Note
             (SELECT 
                     COUNT(1)
                 FROM
-                    ccpph.tede_comment
+                    tede_comment
                 WHERE
                      ArticleId =  a.MiddleId and pid=0
                         AND TypeValue = 3) AS CommentCount,
             (SELECT 
                     COUNT(1)
                 FROM
-                    ccpph.tede_analyze
+                    tede_analyze
                 WHERE
                     UserId = {request.UserId} AND TypeValue = 3
                         AND SourceId = a.MiddleId
@@ -138,7 +138,7 @@ namespace GxPress.Repository.Implement.Note
             (SELECT 
                     COUNT(1)
                 FROM
-                    ccpph.tede_analyze
+                    tede_analyze
                 WHERE
                     UserId = {request.UserId} AND TypeValue = 3
                         AND SourceId = a.MiddleId
@@ -147,7 +147,7 @@ namespace GxPress.Repository.Implement.Note
             (SELECT 
                     COUNT(1)
                 FROM
-                    ccpph.tede_analyze
+                    tede_analyze
                 WHERE
                     UserId = {request.UserId} AND TypeValue = 3
                         AND SourceId = a.MiddleId
@@ -156,7 +156,7 @@ namespace GxPress.Repository.Implement.Note
             (SELECT 
                     COUNT(1)
                 FROM
-                    ccpph.tede_analyze
+                    tede_analyze
                 WHERE
                     UserId = {request.UserId} AND TypeValue = 3
                         AND SourceId = a.MiddleId
@@ -164,9 +164,9 @@ namespace GxPress.Repository.Implement.Note
             (SELECT 
                     COUNT(1)
                 FROM
-                    ccpph.tede_middle
+                    tede_middle
         WHERE
-            ParentId = a.Id and IsDelete=0) FileCount, b.Title, b.Content,b.ReadCount,c.Name,c.AvatarUrl,c.Nick,d.Name FROM ccpph.tede_middle a LEFT JOIN ccpph.tede_note b ON a.MiddleId = b.Id left join ccpph.tede_user c on c.Id=b.UserId left join ccpph.tede_department d on d.Id=c.DepartmentId
+            ParentId = a.Id and IsDelete=0) FileCount, b.Title, b.Content,b.ReadCount,c.Name,c.AvatarUrl,c.Nick,d.Name FROM tede_middle a LEFT JOIN tede_note b ON a.MiddleId = b.Id left join tede_user c on c.Id=b.UserId left join tede_department d on d.Id=c.DepartmentId
                         WHERE a.UserId = {request.VisitUserId} AND a.FolderType = 4 AND a.IsDelete = 0";
                 if (request.FolderId == 0)
                     sql += @" AND(a.RoleId = 1 OR a.RoleId = 3) AND a.ParentId = 0";
@@ -175,7 +175,7 @@ namespace GxPress.Repository.Implement.Note
                 if (!string.IsNullOrEmpty(request.SearchKey))
                     sql += $@"  AND(b.Title LIKE '%{request.SearchKey}%' OR a.FolderName LIKE '%{request.SearchKey}%' or b.Content LIKE '%{request.SearchKey}%' or b.UserId in (select Id from tede_user where name like '%{request.SearchKey}%'))";
                 sql +=
-                    $@" OR a.id IN(SELECT MiddleId FROM ccpph.tede_folder_user WHERE UserId = {request.UserId}) AND a.FolderType = 4 AND a.UserId = {request.VisitUserId}";
+                    $@" OR a.id IN(SELECT MiddleId FROM tede_folder_user WHERE UserId = {request.UserId}) AND a.FolderType = 4 AND a.UserId = {request.VisitUserId}";
                 if (request.FolderId == 0 && !string.IsNullOrEmpty(request.SearchKey))
                     sql += $@"  AND(b.Title LIKE '%{request.SearchKey}%' OR a.FolderName LIKE '%{request.SearchKey}%' or b.Content LIKE '%{request.SearchKey}%' or b.UserId in (select Id from tede_user where name like '%{request.SearchKey}%'))";
                 else if (!string.IsNullOrEmpty(request.SearchKey))
@@ -193,7 +193,7 @@ namespace GxPress.Repository.Implement.Note
                     $@"SELECT  a.*,(SELECT GROUP_CONCAT(SourceName Separator'、') from tede_user_middle where MiddleType=4 and DataSourceId=a.MiddleSonId) as EnjoyUser,(SELECT 
             COUNT(1)
         FROM
-            ccpph.tede_analyze
+            tede_analyze
         WHERE
             UserId = {request.UserId} AND TypeValue = 3
                 AND SourceId = a.MiddleId
@@ -201,7 +201,7 @@ namespace GxPress.Repository.Implement.Note
     (SELECT 
             COUNT(1)
         FROM
-            ccpph.tede_analyze
+            tede_analyze
         WHERE
             UserId = {request.UserId} AND TypeValue = 3
                 AND SourceId = a.MiddleId
@@ -210,14 +210,14 @@ namespace GxPress.Repository.Implement.Note
     (SELECT 
             COUNT(1)
         FROM
-            ccpph.tede_comment
+            tede_comment
         WHERE
             UserId = {request.UserId} AND ArticleId =  a.MiddleId
                 AND TypeValue = 3) AS CommentCount,
     (SELECT 
             COUNT(1)
         FROM
-            ccpph.tede_analyze
+            tede_analyze
         WHERE
             UserId = {request.UserId} AND TypeValue = 3
                 AND SourceId = a.MiddleId
@@ -225,7 +225,7 @@ namespace GxPress.Repository.Implement.Note
     (SELECT 
             COUNT(1)
         FROM
-            ccpph.tede_analyze
+            tede_analyze
         WHERE
             UserId = {request.UserId} AND TypeValue = 3
                 AND SourceId = a.MiddleId
@@ -234,7 +234,7 @@ namespace GxPress.Repository.Implement.Note
     (SELECT 
             COUNT(1)
         FROM
-            ccpph.tede_analyze
+            tede_analyze
         WHERE
             UserId = {request.UserId} AND TypeValue = 3
                 AND SourceId = a.MiddleId
@@ -243,7 +243,7 @@ namespace GxPress.Repository.Implement.Note
     (SELECT 
             COUNT(1)
         FROM
-            ccpph.tede_analyze
+            tede_analyze
         WHERE
             UserId = {request.UserId} AND TypeValue = 3
                 AND SourceId = a.MiddleId
@@ -251,9 +251,9 @@ namespace GxPress.Repository.Implement.Note
     (SELECT 
             COUNT(1)
         FROM
-            ccpph.tede_middle
+            tede_middle
         WHERE
-            ParentId = a.Id and IsDelete=0) FileCount, b.Title, b.Content,b.ReadCount,c.Name,c.AvatarUrl,d.Name FROM ccpph.tede_middle a  LEFT JOIN ccpph.tede_note b ON a.MiddleId = b.Id left join ccpph.tede_user c on c.Id=b.UserId left join ccpph.tede_department d on d.Id=c.DepartmentId WHERE a.UserId = {request.UserId} AND a.FolderType = 4 AND a.IsDelete = 0";
+            ParentId = a.Id and IsDelete=0) FileCount, b.Title, b.Content,b.ReadCount,c.Name,c.AvatarUrl,d.Name FROM tede_middle a  LEFT JOIN tede_note b ON a.MiddleId = b.Id left join tede_user c on c.Id=b.UserId left join tede_department d on d.Id=c.DepartmentId WHERE a.UserId = {request.UserId} AND a.FolderType = 4 AND a.IsDelete = 0";
                 if (request.FolderId == 0 && !string.IsNullOrEmpty(request.SearchKey))
                     sql += $@"  AND(b.Title LIKE '%{request.SearchKey}%' OR a.FolderName LIKE '%{request.SearchKey}%' or b.Content LIKE '%{request.SearchKey}%' or b.UserId in (select Id from tede_user where name like '%{request.SearchKey}%'))";
                 else if (!string.IsNullOrEmpty(request.SearchKey))
@@ -280,7 +280,7 @@ namespace GxPress.Repository.Implement.Note
             if (request.VisitUserId > 0)
             {
                 sql =
-                    $@"SELECT  count(1) FROM ccpph.tede_middle a LEFT JOIN ccpph.tede_note b ON a.MiddleId = b.Id WHERE a.UserId = {request.VisitUserId} AND a.FolderType = 4 AND a.IsDelete = 0";
+                    $@"SELECT  count(1) FROM tede_middle a LEFT JOIN tede_note b ON a.MiddleId = b.Id WHERE a.UserId = {request.VisitUserId} AND a.FolderType = 4 AND a.IsDelete = 0";
                 if (request.FolderId == 0)
                     sql += @" AND(a.RoleId = 1 OR a.RoleId = 3) AND a.ParentId = 0";
                 else
@@ -288,7 +288,7 @@ namespace GxPress.Repository.Implement.Note
                 if (!string.IsNullOrEmpty(request.SearchKey))
                     sql += $@" AND(b.Title LIKE '%{request.SearchKey}%' OR a.FolderName LIKE '%{request.SearchKey}%' or b.Content LIKE '%{request.SearchKey}%' or b.UserId in (select Id from tede_user where name like '%{request.SearchKey}%'))";
                 sql +=
-                    $@" OR a.id IN(SELECT MiddleId FROM ccpph.tede_folder_user WHERE UserId = {request.UserId}) AND a.FolderType = 4 AND a.UserId = {request.VisitUserId}";
+                    $@" OR a.id IN(SELECT MiddleId FROM tede_folder_user WHERE UserId = {request.UserId}) AND a.FolderType = 4 AND a.UserId = {request.VisitUserId}";
                 if (request.FolderId == 0 && !string.IsNullOrEmpty(request.SearchKey))
                     sql += $@"  AND(b.Title LIKE '%{request.SearchKey}%' OR a.FolderName LIKE '%{request.SearchKey}%' or b.Content LIKE '%{request.SearchKey}%' or b.UserId in (select Id from tede_user where name like '%{request.SearchKey}%'))";
                 else if (!string.IsNullOrEmpty(request.SearchKey))
@@ -299,7 +299,7 @@ namespace GxPress.Repository.Implement.Note
             else
             {
                 sql =
-                    $@"SELECT  count(1) FROM ccpph.tede_middle a LEFT JOIN ccpph.tede_note b ON a.MiddleId = b.Id left join ccpph.tede_user c on c.Id=b.UserId left join ccpph.tede_department d on d.Id=c.DepartmentId WHERE a.UserId = {request.UserId} AND a.FolderType = 4 AND a.IsDelete = 0";
+                    $@"SELECT  count(1) FROM tede_middle a LEFT JOIN tede_note b ON a.MiddleId = b.Id left join tede_user c on c.Id=b.UserId left join tede_department d on d.Id=c.DepartmentId WHERE a.UserId = {request.UserId} AND a.FolderType = 4 AND a.IsDelete = 0";
                 if (request.FolderId == 0 && !string.IsNullOrEmpty(request.SearchKey))
                     sql += $@"  AND(b.Title LIKE '%{request.SearchKey}%' OR a.FolderName LIKE '%{request.SearchKey}%' or b.Content LIKE '%{request.SearchKey}%' or b.UserId in (select Id from tede_user where name like '%{request.SearchKey}%'))";
                 else if (!string.IsNullOrEmpty(request.SearchKey))