李昊 4 years ago
parent
commit
1b2a9ad34e
21 changed files with 99 additions and 99 deletions
  1. 1 1
      gx_api/GxPress/Repository/GxPress.Repository.Implement/AddressBookGroupUserRepository.cs
  2. 2 2
      gx_api/GxPress/Repository/GxPress.Repository.Implement/AddresseeRepository.cs
  3. 1 1
      gx_api/GxPress/Repository/GxPress.Repository.Implement/AppVersionRepository.cs
  4. 1 1
      gx_api/GxPress/Repository/GxPress.Repository.Implement/ArticleLabel/ArticleLabelRepository.cs
  5. 2 2
      gx_api/GxPress/Repository/GxPress.Repository.Implement/FeedbackRepository.cs
  6. 1 1
      gx_api/GxPress/Repository/GxPress.Repository.Implement/GroupChatRepository.cs
  7. 1 1
      gx_api/GxPress/Repository/GxPress.Repository.Implement/GroupChatUserRepository.cs
  8. 1 1
      gx_api/GxPress/Repository/GxPress.Repository.Implement/Job/JobRepository.cs
  9. 12 12
      gx_api/GxPress/Repository/GxPress.Repository.Implement/Missive/MissiveRepository.cs
  10. 20 20
      gx_api/GxPress/Repository/GxPress.Repository.Implement/NoticeRepository.cs
  11. 4 4
      gx_api/GxPress/Repository/GxPress.Repository.Implement/OftenContactRepository.cs
  12. 1 1
      gx_api/GxPress/Repository/GxPress.Repository.Implement/ThesaurusRepository.cs
  13. 2 2
      gx_api/GxPress/Repository/GxPress.Repository.Implement/Topic/TopicGroupRepository.cs
  14. 2 2
      gx_api/GxPress/Repository/GxPress.Repository.Implement/Topic/TopicGroupUserRepository.cs
  15. 11 11
      gx_api/GxPress/Repository/GxPress.Repository.Implement/UserRepository.cs
  16. 2 2
      gx_api/GxPress/Repository/GxPress.Repository.Implement/Visit/VisitRepository.cs
  17. 1 1
      gx_api/GxPress/Repository/GxPress.Repository.Implement/WorkFlow/FlowFieldValueRepository.cs
  18. 6 6
      gx_api/GxPress/Repository/GxPress.Repository.Implement/WorkFlow/FlowRepository.cs
  19. 21 21
      gx_api/GxPress/Repository/GxPress.Repository.Implement/WorkFlow/FlowTodoRepository.cs
  20. 1 1
      gx_api/GxPress/Repository/GxPress.Repository.Implement/WorkMeeting/MeetingRepository.cs
  21. 6 6
      gx_api/GxPress/Repository/GxPress.Repository.Implement/WorkMeeting/MeetingSummaryRepository.cs

+ 1 - 1
gx_api/GxPress/Repository/GxPress.Repository.Implement/AddressBookGroupUserRepository.cs

@@ -70,7 +70,7 @@ namespace GxPress.Repository.Implement
         {
             var result = new AddressBookGroupUserListResult();
             //sql
-            var sql = $"select b.Id,b.AddressBookGroupId,a.Id as UserId,a.Name as UserName,a.AvatarUrl,a.ImId from ccpph.tede_user a inner join ccpph.tede_address_book_group_user b on a.Id=b.UserId where b. AddressBookGroupId={request.AddressBookGroupId}";
+            var sql = $"select b.Id,b.AddressBookGroupId,a.Id as UserId,a.Name as UserName,a.AvatarUrl,a.ImId from tede_user a inner join tede_address_book_group_user b on a.Id=b.UserId where b. AddressBookGroupId={request.AddressBookGroupId}";
             var databaseType = StringUtils.ToEnum<DatabaseType>(_databaseTypeStr, DatabaseType.MySql);
             var database = new Database(databaseType, _connectionString);
             var connection = database.GetConnection();

+ 2 - 2
gx_api/GxPress/Repository/GxPress.Repository.Implement/AddresseeRepository.cs

@@ -101,7 +101,7 @@ namespace GxPress.Repository.Implement
                 sqlValue += " and a.IsRead=0";
             if (!string.IsNullOrWhiteSpace(request.Key))
                 sqlValue += $" and b.Name like '%{request.Key}%'";
-            var sql = $"SELECT a.*,b.Name,b.AvatarUrl,c.Name FROM ccpph.tede_notice_addressee a inner join ccpph.tede_user b on a.UserId=b.Id inner join ccpph.tede_department c on c.Id=b.DepartmentId where a.NoticeId={request.NoticeId} {sqlValue} order by a.LastModifiedDate desc";
+            var sql = $"SELECT a.*,b.Name,b.AvatarUrl,c.Name FROM tede_notice_addressee a inner join tede_user b on a.UserId=b.Id inner join tede_department c on c.Id=b.DepartmentId where a.NoticeId={request.NoticeId} {sqlValue} order by a.LastModifiedDate desc";
             var databaseType = StringUtils.ToEnum<DatabaseType>(_databaseTypeStr, DatabaseType.MySql);
             var database = new Database(databaseType, _connectionString);
             var connection = database.GetConnection();
@@ -126,7 +126,7 @@ namespace GxPress.Repository.Implement
         public async Task<IEnumerable<User>> GetUserByNoticeIdAsync(int noticeId)
         {
 
-            var sql = $"SELECT  b.* FROM ccpph.tede_notice_addressee a inner join ccpph.tede_user b on a.UserId=b.Id where a.NoticeId={noticeId} and a.IsAdmin=0;";
+            var sql = $"SELECT  b.* FROM tede_notice_addressee a inner join tede_user b on a.UserId=b.Id where a.NoticeId={noticeId} and a.IsAdmin=0;";
             var databaseType = StringUtils.ToEnum<DatabaseType>(_databaseTypeStr, DatabaseType.MySql);
             var database = new Database(databaseType, _connectionString);
             var connection = database.GetConnection();

+ 1 - 1
gx_api/GxPress/Repository/GxPress.Repository.Implement/AppVersionRepository.cs

@@ -92,7 +92,7 @@ namespace GxPress.Repository.Implement
         /// <returns></returns>
         public async Task<IEnumerable<AppVersion>> GetAppVersionsAsync()
         {
-            string sql = "SELECT * FROM ccpph.tede_app_version where Id in(select max(id) from tede_app_version group by VersionType)";
+            string sql = "SELECT * FROM tede_app_version where Id in(select max(id) from tede_app_version group by VersionType)";
             var databaseType = StringUtils.ToEnum<DatabaseType>(_databaseTypeStr, DatabaseType.MySql);
             var database = new Database(databaseType, _connectionString);
             var connection = database.GetConnection();

+ 1 - 1
gx_api/GxPress/Repository/GxPress.Repository.Implement/ArticleLabel/ArticleLabelRepository.cs

@@ -73,7 +73,7 @@ namespace GxPress.Repository.Implement.ArticleLabel
         /// <returns></returns>
         public async Task<IEnumerable<ArticleInnerLabelResult>> GetArticleLabelsAsync(int articleId)
         {
-            var sql = $"select a.*,b.LabelName from ccpph.tede_article_inner_label a inner join ccpph.tede_article_label b  on a.ArticleLabelId=b.Id where a.ArticleId={articleId}";
+            var sql = $"select a.*,b.LabelName from tede_article_inner_label a inner join tede_article_label b  on a.ArticleLabelId=b.Id where a.ArticleId={articleId}";
             var databaseType = StringUtils.ToEnum<DatabaseType>(_databaseTypeStr, DatabaseType.MySql);
             var database = new Database(databaseType, _connectionString);
             var connection = database.GetConnection();

+ 2 - 2
gx_api/GxPress/Repository/GxPress.Repository.Implement/FeedbackRepository.cs

@@ -63,8 +63,8 @@ namespace GxPress.Repository.Implement
                     }
                 }
             }
-            var sql = $"SELECT a.*,b.Name FROM ccpph.tede_feedback a inner join ccpph.tede_user b on a.UserId=b.Id where 1=1 {sqlValue}";
-            var countSql = $"SELECT count(1) FROM ccpph.tede_feedback a inner join ccpph.tede_user b on a.UserId=b.Id where 1=1 {sqlValue}";
+            var sql = $"SELECT a.*,b.Name FROM tede_feedback a inner join tede_user b on a.UserId=b.Id where 1=1 {sqlValue}";
+            var countSql = $"SELECT count(1) FROM tede_feedback a inner join tede_user b on a.UserId=b.Id where 1=1 {sqlValue}";
             sql += $" order by a.CreatedDate desc  LIMIT {(request.Page - 1) * request.PerPage},{request.PerPage}";
             var databaseType = StringUtils.ToEnum<DatabaseType>(_databaseTypestr, DatabaseType.MySql);
             var database = new Database(databaseType, _connectionString);

+ 1 - 1
gx_api/GxPress/Repository/GxPress.Repository.Implement/GroupChatRepository.cs

@@ -391,7 +391,7 @@ namespace GxPress.Repository.Implement
         /// <returns></returns>
         public async Task<GroupChatInfoResult> GetGroupChatInfoByImIdAsync(string imId)
         {
-            var sql = $"select *,(select Name from ccpph.tede_user where id=a.UserId) as UserName from ccpph.tede_group_chat a where a.GroupChatImId='{imId}';";
+            var sql = $"select *,(select Name from tede_user where id=a.UserId) as UserName from tede_group_chat a where a.GroupChatImId='{imId}';";
             var databaseType = StringUtils.ToEnum<DatabaseType>(_databaseTypeStr, DatabaseType.MySql);
             var database = new Database(databaseType, _connectionString);
             var connection = database.GetConnection();

+ 1 - 1
gx_api/GxPress/Repository/GxPress.Repository.Implement/GroupChatUserRepository.cs

@@ -138,7 +138,7 @@ namespace GxPress.Repository.Implement
         /// <returns></returns>
         public async Task<IEnumerable<GroupChatUserByGroupChatIdResult>> GetGroupChatUserByGroupChatIdAsync(GroupChatUserSearchRequest request)
         {
-            var sql = $"SELECT a.*,b.Name,b.AvatarUrl FROM ccpph.tede_group_chat_user a inner join ccpph.tede_user b on a.UserId=b.Id  where a.GroupChatImId='{request.GroupChatImId}'";
+            var sql = $"SELECT a.*,b.Name,b.AvatarUrl FROM tede_group_chat_user a inner join tede_user b on a.UserId=b.Id  where a.GroupChatImId='{request.GroupChatImId}'";
             var databaseType = StringUtils.ToEnum<DatabaseType>(_databaseTypeStr, DatabaseType.MySql);
             var database = new Database(databaseType, _connectionString);
             var connection = database.GetConnection();

+ 1 - 1
gx_api/GxPress/Repository/GxPress.Repository.Implement/Job/JobRepository.cs

@@ -41,7 +41,7 @@ namespace GxPress.Repository.Implement.Job
         /// <returns></returns>
         public async Task<IEnumerable<JobTopicResult>> ExecuteTopic()
         {
-            string sql = "select a.Id,a.Title,a.Content,b.UserId,c.Name,a.CreatedDate,d.AvatarUrl from ccpph.tede_topic a inner join  ccpph.tede_topic_addressee b on a.Id=b.TopicId inner join ccpph.tede_user c on c.Id=b.UserId inner join ccpph.tede_user d on d.Id=a.UserId where b.IsUpload=0 order by CreatedDate desc";
+            string sql = "select a.Id,a.Title,a.Content,b.UserId,c.Name,a.CreatedDate,d.AvatarUrl from tede_topic a inner join  tede_topic_addressee b on a.Id=b.TopicId inner join tede_user c on c.Id=b.UserId inner join tede_user d on d.Id=a.UserId where b.IsUpload=0 order by CreatedDate desc";
             var databaseType = StringUtils.ToEnum<DatabaseType>(_databaseTypeStr, DatabaseType.MySql);
             var database = new Database(databaseType, _connectionString);
             var connection = database.GetConnection();

+ 12 - 12
gx_api/GxPress/Repository/GxPress.Repository.Implement/Missive/MissiveRepository.cs

@@ -87,7 +87,7 @@ namespace GxPress.Repository.Implement.Missive
                                                 OR a.UserId IN (SELECT 
                                                     Id
                                                 FROM
-                                                    ccpph.tede_user
+                                                    tede_user
                                                 WHERE
                                                     Id IN (SELECT 
                                                             UserId
@@ -116,43 +116,43 @@ namespace GxPress.Repository.Implement.Missive
                         (SELECT 
                                 COUNT(1)
                             FROM
-                                ccpph.tede_middle
+                                tede_middle
                             WHERE
                                 ParentId = a.Id and IsDelete=0 and NoticeAddresseeType=1) as FileCount,
                         (SELECT 
                                 COUNT(1)
                             FROM
-                                ccpph.tede_missive_addressee
+                                tede_missive_addressee
                             WHERE
                                 MissiveId = a.MiddleId AND IsRead = 1) AS ReadCount,
                         (SELECT 
                                 COUNT(1)
                             FROM
-                                ccpph.tede_missive_addressee
+                                tede_missive_addressee
                             WHERE
                                 MissiveId = a.MiddleId) AS AllCount,
                         (SELECT 
                                 COUNT(1)
                             FROM
-                                ccpph.tede_missive_addressee
+                                tede_missive_addressee
                             WHERE
                                 MissiveId = a.MiddleId AND IsRead = 1
                                     AND UserId =  {request.UserId}
                             LIMIT 0 , 1) AS IsRead, b.Title, b.UserName, b.MissiveType,b.SendUserId,b.Content,b.SourceId
                                             FROM
-                                                ccpph.tede_middle a
+                                                tede_middle a
                                                     left JOIN
-                                                ccpph.tede_missive b ON a.MiddleId = b.Id  INNER JOIN
-                                            ccpph.tede_user c ON c.Id = a.UserId
+                                                tede_missive b ON a.MiddleId = b.Id  INNER JOIN
+                                            tede_user c ON c.Id = a.UserId
                         WHERE
                             a.FolderType = 5 {sb}  order by a.IsTop desc,a.LastModifiedDate desc,a.AttributeValue desc limit {(request.Page - 1) * request.PerPage},{request.PerPage}";
             var sqlCount = $@"SELECT 
                             count(1)
                         FROM
-                            ccpph.tede_middle a
+                            tede_middle a
                                 left JOIN
-                            ccpph.tede_missive b ON a.MiddleId = b.Id  INNER JOIN
-                            ccpph.tede_user c ON c.Id = a.UserId
+                            tede_missive b ON a.MiddleId = b.Id  INNER JOIN
+                            tede_user c ON c.Id = a.UserId
                         WHERE
                             a.FolderType = 5 {sb} ";
             var result = new PagedList<MissiveSearchResult>();
@@ -177,7 +177,7 @@ namespace GxPress.Repository.Implement.Missive
         }
         public async Task<List<JobMissiveResult>> ElasticSearchMissive()
         {
-            var sql = "select a.Id,a.UserId,a.GuId,a.CreatedDate,b.Id,b.Title,b.Content,b.CreatedDate,c.Name,c.AvatarUrl from ccpph.tede_middle a inner join ccpph.tede_Missive b on a.MiddleId=b.Id inner join ccpph.tede_user c on c.Id=b.UserId where a.FolderType=5 and a.IsUpload=0 order by a.CreatedDate desc limit 0,100";
+            var sql = "select a.Id,a.UserId,a.GuId,a.CreatedDate,b.Id,b.Title,b.Content,b.CreatedDate,c.Name,c.AvatarUrl from tede_middle a inner join tede_Missive b on a.MiddleId=b.Id inner join tede_user c on c.Id=b.UserId where a.FolderType=5 and a.IsUpload=0 order by a.CreatedDate desc limit 0,100";
             var databaseType = StringUtils.ToEnum<DatabaseType>(_databaseTypeStr, DatabaseType.MySql);
             var database = new Database(databaseType, _connectionString);
             var connection = database.GetConnection();

+ 20 - 20
gx_api/GxPress/Repository/GxPress.Repository.Implement/NoticeRepository.cs

@@ -366,7 +366,7 @@ namespace GxPress.Repository.Implement
             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
-                            ccpph.tede_analyze
+                            tede_analyze
                         WHERE
                               TypeValue = 2
                                 AND SourceId = a.MiddleId
@@ -374,7 +374,7 @@ namespace GxPress.Repository.Implement
                     (SELECT 
                             COUNT(1)
                         FROM
-                            ccpph.tede_analyze
+                            tede_analyze
                         WHERE
                             UserId = {request.UserId} AND TypeValue = 2
                                 AND SourceId = a.MiddleId
@@ -383,14 +383,14 @@ namespace GxPress.Repository.Implement
                     (SELECT 
                             COUNT(1)
                         FROM
-                            ccpph.tede_comment
+                            tede_comment
                         WHERE
                             ArticleId =  a.MiddleId and pid=0
                                 AND TypeValue = 2) AS CommentCount,
                     (SELECT 
                             COUNT(1)
                         FROM
-                            ccpph.tede_analyze
+                            tede_analyze
                         WHERE
                             UserId = {request.UserId} AND TypeValue = 2
                                 AND SourceId = a.MiddleId
@@ -398,7 +398,7 @@ namespace GxPress.Repository.Implement
                     (SELECT 
                             COUNT(1)
                         FROM
-                            ccpph.tede_analyze
+                            tede_analyze
                         WHERE
                             UserId = {request.UserId} AND TypeValue = 2
                                 AND SourceId = a.MiddleId
@@ -407,7 +407,7 @@ namespace GxPress.Repository.Implement
                     (SELECT 
                             COUNT(1)
                         FROM
-                            ccpph.tede_analyze
+                            tede_analyze
                         WHERE
                             UserId = {request.UserId} AND TypeValue = 2
                                 AND SourceId = a.MiddleId
@@ -416,7 +416,7 @@ namespace GxPress.Repository.Implement
                     (SELECT 
                             COUNT(1)
                         FROM
-                            ccpph.tede_analyze
+                            tede_analyze
                         WHERE
                             UserId = {request.UserId} AND TypeValue = 2
                                 AND SourceId = a.MiddleId
@@ -424,32 +424,32 @@ namespace GxPress.Repository.Implement
                     (SELECT 
                             COUNT(1)
                         FROM
-                            ccpph.tede_middle
+                            tede_middle
                         WHERE
                             ParentId = a.Id and IsDelete=0 and NoticeAddresseeType<>2) as FileCount,(SELECT 
                     COUNT(1)
                 FROM
-                    ccpph.tede_notice_addressee
+                    tede_notice_addressee
                 WHERE
                     NoticeId = a.MiddleId AND IsRead = 1) as ReadCount,(SELECT 
                     COUNT(1)
                 FROM
-                    ccpph.tede_notice_addressee
+                    tede_notice_addressee
                 WHERE
                     NoticeId = a.MiddleId ) as AllCount,(SELECT 
                     COUNT(1)
                 FROM
-                    ccpph.tede_notice_addressee
+                    tede_notice_addressee
                 WHERE
     NoticeId = a.MiddleId AND IsRead = 1 and UserId={request.UserId} limit 0,1) as IsRead, b.*, c.Name, c.AvatarUrl, d.*
                                     FROM
-                                        ccpph.tede_middle a
+                                        tede_middle a
                                             left   JOIN
-                                        ccpph.tede_notice b ON a.MiddleId = b.Id
+                                        tede_notice b ON a.MiddleId = b.Id
                                             left JOIN
-                                        ccpph.tede_user c ON b.UserId = c.Id
+                                        tede_user c ON b.UserId = c.Id
                                             left JOIN
-                                        ccpph.tede_notice_addressee d ON d.Id = a.MiddleSonId
+                                        tede_notice_addressee d ON d.Id = a.MiddleSonId
                                     WHERE
                                         a.UserId = {request.UserId} and a.FolderType=1
                                             {sb}
@@ -458,13 +458,13 @@ namespace GxPress.Repository.Implement
             var countSql = string.Format(@"SELECT 
                                        count(1)
                                     FROM
-                                        ccpph.tede_middle a
+                                        tede_middle a
                                             left   JOIN
-                                        ccpph.tede_notice b ON a.MiddleId = b.Id
+                                        tede_notice b ON a.MiddleId = b.Id
                                             left JOIN
-                                        ccpph.tede_user c ON b.UserId = c.Id
+                                        tede_user c ON b.UserId = c.Id
                                             left JOIN
-                                        ccpph.tede_notice_addressee d ON d.Id = a.MiddleSonId
+                                        tede_notice_addressee d ON d.Id = a.MiddleSonId
                                     WHERE
                                         a.UserId = {1} and a.FolderType=1
                                             {0}", sb, request.UserId);
@@ -523,7 +523,7 @@ namespace GxPress.Repository.Implement
         /// <returns></returns>
         public async Task<List<JobNoticeResult>> ElasticSearchNotice()
         {
-            var sql = "select a.Id,a.UserId,a.GuId,a.CreatedDate,b.Id,b.Title,b.Content,b.CreatedDate,c.Name,c.AvatarUrl from ccpph.tede_middle a inner join ccpph.tede_notice b on a.MiddleId=b.Id inner join ccpph.tede_user c on c.Id=b.UserId where a.FolderType=1  and a.IsUpload=0 order by a.CreatedDate desc limit 0,100";
+            var sql = "select a.Id,a.UserId,a.GuId,a.CreatedDate,b.Id,b.Title,b.Content,b.CreatedDate,c.Name,c.AvatarUrl from tede_middle a inner join tede_notice b on a.MiddleId=b.Id inner join tede_user c on c.Id=b.UserId where a.FolderType=1  and a.IsUpload=0 order by a.CreatedDate desc limit 0,100";
             var databaseType = StringUtils.ToEnum<DatabaseType>(_databaseTypeStr, DatabaseType.MySql);
             var database = new Database(databaseType, _connectionString);
             var connection = database.GetConnection();

+ 4 - 4
gx_api/GxPress/Repository/GxPress.Repository.Implement/OftenContactRepository.cs

@@ -275,7 +275,7 @@ namespace GxPress.Repository.Implement
         public async Task<IEnumerable<OftenContactInfo>> GetContactInfosAsync(OftenContactSearchRequest request)
         {
             var sql =
-               $"select a.*,b.* from ccpph.tede_middle a left join ccpph.tede_often_contact b on a.MiddleId=b.Id where a.FolderType=10 and a.UserId={request.UserId} and a.ParentId={request.IndividualGroupId} and a.IsDelete=0 order by a. IsTop desc,a.LastModifiedDate desc";
+               $"select a.*,b.* from tede_middle a left join tede_often_contact b on a.MiddleId=b.Id where a.FolderType=10 and a.UserId={request.UserId} and a.ParentId={request.IndividualGroupId} and a.IsDelete=0 order by a. IsTop desc,a.LastModifiedDate desc";
             var databaseType = StringUtils.ToEnum<DatabaseType>(_databaseTypeStr, DatabaseType.MySql);
             var database = new Database(databaseType, _connectionString);
             var connection = database.GetConnection();
@@ -294,7 +294,7 @@ namespace GxPress.Repository.Implement
         public async Task<IEnumerable<OftenContactInfo>> GetContactInfoAllAsync(OftenContactSearchRequest request)
         {
             var sql =
-               $"select a.*,b.* from ccpph.tede_middle a inner join ccpph.tede_often_contact b on a.MiddleId=b.Id where a.FolderType=10 and a.UserId={request.UserId}  and a.IsDelete=0 order by a. IsTop desc,a.LastModifiedDate desc";
+               $"select a.*,b.* from tede_middle a inner join tede_often_contact b on a.MiddleId=b.Id where a.FolderType=10 and a.UserId={request.UserId}  and a.IsDelete=0 order by a. IsTop desc,a.LastModifiedDate desc";
             var databaseType = StringUtils.ToEnum<DatabaseType>(_databaseTypeStr, DatabaseType.MySql);
             var database = new Database(databaseType, _connectionString);
             var connection = database.GetConnection();
@@ -315,7 +315,7 @@ namespace GxPress.Repository.Implement
         /// <returns></returns>
         public async Task<List<JobChatResult>> ElasticSearchGroupChat()
         {
-            string sql = "select a.Id,a.GuId,a.MiddleId,a.UserId,a.CreatedDate,b.ContactUserId,c.AvatarUrl,c.Name from ccpph.tede_middle a  inner join ccpph.tede_often_contact b on a.MiddleId=b.Id  inner join ccpph.tede_group_chat c on c.GroupChatImId=b.ContactUserId where a.FolderType=10 and b.ChatType=2 and a.IsUpload=0 order by a.CreatedDate desc limit 0,100";
+            string sql = "select a.Id,a.GuId,a.MiddleId,a.UserId,a.CreatedDate,b.ContactUserId,c.AvatarUrl,c.Name from tede_middle a  inner join tede_often_contact b on a.MiddleId=b.Id  inner join tede_group_chat c on c.GroupChatImId=b.ContactUserId where a.FolderType=10 and b.ChatType=2 and a.IsUpload=0 order by a.CreatedDate desc limit 0,100";
             var databaseType = StringUtils.ToEnum<DatabaseType>(_databaseTypeStr, DatabaseType.MySql);
             var database = new Database(databaseType, _connectionString);
             var connection = database.GetConnection();
@@ -338,7 +338,7 @@ namespace GxPress.Repository.Implement
         /// <returns></returns>
         public async Task<List<JobChatResult>> ElasticSearchChat()
         {
-            string sql = "select a.Id,a.GuId,a.MiddleId,a.UserId,a.CreatedDate,b.ContactUserId,c.AvatarUrl,c.Name,c.ImId from ccpph.tede_middle a  inner join ccpph.tede_often_contact b on a.MiddleId=b.Id  inner join ccpph.tede_user c on c.Id=b.ContactUserId where a.FolderType=10 and b.ChatType=1 and a.IsUpload=0 order by a.CreatedDate desc limit 0,100";
+            string sql = "select a.Id,a.GuId,a.MiddleId,a.UserId,a.CreatedDate,b.ContactUserId,c.AvatarUrl,c.Name,c.ImId from tede_middle a  inner join tede_often_contact b on a.MiddleId=b.Id  inner join tede_user c on c.Id=b.ContactUserId where a.FolderType=10 and b.ChatType=1 and a.IsUpload=0 order by a.CreatedDate desc limit 0,100";
             var databaseType = StringUtils.ToEnum<DatabaseType>(_databaseTypeStr, DatabaseType.MySql);
             var database = new Database(databaseType, _connectionString);
             var connection = database.GetConnection();

+ 1 - 1
gx_api/GxPress/Repository/GxPress.Repository.Implement/ThesaurusRepository.cs

@@ -126,7 +126,7 @@ namespace GxPress.Repository.Implement
         /// <returns></returns>
         public async Task<IEnumerable<Thesaurus>> GetTopListAsync(ThesaurusSearchRequest request)
         {
-            var sql = $"SELECT * FROM ccpph.tede_thesaurus where ThesaurusType={request.ThesaurusType} ORDER BY rand() LIMIT 3";
+            var sql = $"SELECT * FROM tede_thesaurus where ThesaurusType={request.ThesaurusType} ORDER BY rand() LIMIT 3";
             var databaseType = StringUtils.ToEnum<DatabaseType>(_databaseTypeStr, DatabaseType.MySql);
             var database = new Database(databaseType, _connectionString);
             var connection = database.GetConnection();

+ 2 - 2
gx_api/GxPress/Repository/GxPress.Repository.Implement/Topic/TopicGroupRepository.cs

@@ -107,7 +107,7 @@ namespace GxPress.Repository.Implement.Topic
                     .Where(nameof(TopicGroup.Id), firstId));
                 sort = topicGroupSecond.Sort;
                 var sql =
-                    $"update ccpph.tede_topic_group set Sort=Sort-1 where UserId={userId}  and Sort<={sort} and Id not in({firstId}) and id>0";
+                    $"update tede_topic_group set Sort=Sort-1 where UserId={userId}  and Sort<={sort} and Id not in({firstId}) and id>0";
                 return await connection.ExecuteAsync(sql) > 0;
             }
             else
@@ -117,7 +117,7 @@ namespace GxPress.Repository.Implement.Topic
                     .Where(nameof(TopicGroup.Id), firstId));
                 sort = topicGroupSecond.Sort;
                 var sql =
-                    $"update ccpph.tede_topic_group set Sort=Sort+1 where UserId={userId}  and Sort>={sort} and Id not in({firstId}) and id>0";
+                    $"update tede_topic_group set Sort=Sort+1 where UserId={userId}  and Sort>={sort} and Id not in({firstId}) and id>0";
                 return await connection.ExecuteAsync(sql) > 0;
             }
         }

+ 2 - 2
gx_api/GxPress/Repository/GxPress.Repository.Implement/Topic/TopicGroupUserRepository.cs

@@ -115,7 +115,7 @@ namespace GxPress.Repository.Implement.Topic
         {
             var result = new PagedList<TopicGroupUserResult>();
             string sql =
-                $"SELECT a.*,b.Name,b.AvatarUrl FROM ccpph.tede_topic_group_user a inner join ccpph.tede_user b on a.UserId=b.Id where 1=1 and a.TopicGroupId={topicGroupId}";
+                $"SELECT a.*,b.Name,b.AvatarUrl FROM tede_topic_group_user a inner join tede_user b on a.UserId=b.Id where 1=1 and a.TopicGroupId={topicGroupId}";
             var databaseType = StringUtils.ToEnum<DatabaseType>(_databaseTypestr, DatabaseType.MySql);
             var database = new Database(databaseType, _connectionString);
             var connection = database.GetConnection();
@@ -141,7 +141,7 @@ namespace GxPress.Repository.Implement.Topic
         {
             var result = new PagedList<TopicGroupUserResult>();
             string sql =
-                $"SELECT a.*,b.Name,b.AvatarUrl FROM ccpph.tede_topic_group_user a inner join ccpph.tede_user b on a.UserId=b.Id where a.TopicGroupId={request.TopicGroupId} and b.Name like '%{request.Key}%'";
+                $"SELECT a.*,b.Name,b.AvatarUrl FROM tede_topic_group_user a inner join tede_user b on a.UserId=b.Id where a.TopicGroupId={request.TopicGroupId} and b.Name like '%{request.Key}%'";
             var databaseType = StringUtils.ToEnum<DatabaseType>(_databaseTypestr, DatabaseType.MySql);
             var database = new Database(databaseType, _connectionString);
             var connection = database.GetConnection();

+ 11 - 11
gx_api/GxPress/Repository/GxPress.Repository.Implement/UserRepository.cs

@@ -728,9 +728,9 @@ namespace GxPress.Repository.Implement
                     notInUserIds += ")";
                 }
             }
-            var sql = $"select * from ccpph.tede_user  where  (Name like '%{request.Key}%' or Phone like '%{request.Key}%' or Email like '%{request.Key}%') {notInUserIds}";
+            var sql = $"select * from tede_user  where  (Name like '%{request.Key}%' or Phone like '%{request.Key}%' or Email like '%{request.Key}%') {notInUserIds}";
             if (request.SearchType == 2 && !string.IsNullOrWhiteSpace(request.Key) && request.DepartmentId > 0)
-                sql = $"select a.* from ccpph.tede_user a inner join ccpph.tede_address_book_group_user c on a.Id=c.UserId where c.AddressBookGroupId={request.DepartmentId} and (a.Name like '%{request.Key}%' or a.Phone like '%{request.Key}%' or a.Email like '%{request.Key}%') {notInUserIds}";
+                sql = $"select a.* from tede_user a inner join tede_address_book_group_user c on a.Id=c.UserId where c.AddressBookGroupId={request.DepartmentId} and (a.Name like '%{request.Key}%' or a.Phone like '%{request.Key}%' or a.Email like '%{request.Key}%') {notInUserIds}";
             if (request.SearchType == 1 && !string.IsNullOrWhiteSpace(request.Key) && request.DepartmentId > 0)
             {
                 //递归获取部门Id
@@ -740,7 +740,7 @@ namespace GxPress.Repository.Implement
                     departmentValue += $"{item.Id},";
                 departmentValue = departmentValue.Remove(departmentValue.Length - 1, 1);
                 departmentValue += ")";
-                sql = $"select * from ccpph.tede_user where DepartmentId in {departmentValue} and (Name like '%{request.Key}%' or Phone like '%{request.Key}%' or Email like '%{request.Key}%') {notInUserIds}";
+                sql = $"select * from tede_user where DepartmentId in {departmentValue} and (Name like '%{request.Key}%' or Phone like '%{request.Key}%' or Email like '%{request.Key}%') {notInUserIds}";
             }
             var databaseType = StringUtils.ToEnum<DatabaseType>(_databaseTypeStr, DatabaseType.MySql);
             var database = new Database(databaseType, _connectionString);
@@ -764,7 +764,7 @@ namespace GxPress.Repository.Implement
         }
         public async Task<List<Entity.Department>> GetUpDepartmentAsync(int id, List<Department> departments)
         {
-            var sql = $"select * from ccpph.tede_department where Id={id}";
+            var sql = $"select * from tede_department where Id={id}";
             var databaseType = StringUtils.ToEnum<DatabaseType>(_databaseTypeStr, DatabaseType.MySql);
             var database = new Database(databaseType, _connectionString);
             var connection = database.GetConnection();
@@ -777,7 +777,7 @@ namespace GxPress.Repository.Implement
         }
         public async Task<List<Entity.Department>> GetDepartmentAsync(int pid, List<Department> departments)
         {
-            var sql = $"select * from ccpph.tede_department where ParentId={pid}";
+            var sql = $"select * from tede_department where ParentId={pid}";
             var databaseType = StringUtils.ToEnum<DatabaseType>(_databaseTypeStr, DatabaseType.MySql);
             var database = new Database(databaseType, _connectionString);
             var connection = database.GetConnection();
@@ -833,14 +833,14 @@ namespace GxPress.Repository.Implement
         public async Task<UserCountResult> GetUserCountAsync(int userId)
         {
             var result = new UserCountResult();
-            string sql = $"select count(1) from ccpph.tede_middle where FolderType=1 and UserId={userId} and MiddleId in (select NoticeId from ccpph.tede_notice_addressee where UserId={userId} and IsRead=0 and IsDelete=0)";
+            string sql = $"select count(1) from tede_middle where FolderType=1 and UserId={userId} and MiddleId in (select NoticeId from tede_notice_addressee where UserId={userId} and IsRead=0 and IsDelete=0)";
             var databaseType = StringUtils.ToEnum<DatabaseType>(_databaseTypeStr, DatabaseType.MySql);
             var database = new Database(databaseType, _connectionString);
             var connection = database.GetConnection();
             var noticeCount = await connection.ExecuteScalarAsync<int>(sql);
-            sql = $"select count(1) from ccpph.tede_middle where FolderType=5 and UserId={userId} and MiddleId in (select MissiveId from ccpph.tede_missive_addressee where UserId={userId} and IsDelete=0 and IsRead=0)";
+            sql = $"select count(1) from tede_middle where FolderType=5 and UserId={userId} and MiddleId in (select MissiveId from tede_missive_addressee where UserId={userId} and IsDelete=0 and IsRead=0)";
             var missiveCount = await connection.ExecuteScalarAsync<int>(sql);
-            sql = $"SELECT count(1) FROM ccpph.tede_admin_verify where AdminId={userId} and DisposeType=0";
+            sql = $"SELECT count(1) FROM tede_admin_verify where AdminId={userId} and DisposeType=0";
             noticeCount += await connection.ExecuteScalarAsync<int>(sql);
             result.noticeCount = noticeCount;
             result.missiveCount = missiveCount;
@@ -865,7 +865,7 @@ namespace GxPress.Repository.Implement
                 strSql = strSql.Remove(strSql.Length - 1, 1);
                 strSql += ")";
             }
-            string sql = $" select * from ccpph.tede_user where Id in( SELECT UserId FROM ccpph.tede_flow_todo where FlowId={flowId} and Type='{type}' {strSql})";
+            string sql = $" select * from tede_user where Id in( SELECT UserId FROM tede_flow_todo where FlowId={flowId} and Type='{type}' {strSql})";
             var databaseType = StringUtils.ToEnum<DatabaseType>(_databaseTypeStr, DatabaseType.MySql);
             var database = new Database(databaseType, _connectionString);
             var connection = database.GetConnection();
@@ -877,7 +877,7 @@ namespace GxPress.Repository.Implement
 
         public async Task<List<JobUserResult>> ElasticSearchUser()
         {
-            var sql = "select * from ccpph.tede_user where IsUpload=0 limit 0,100";
+            var sql = "select * from tede_user where IsUpload=0 limit 0,100";
             var databaseType = StringUtils.ToEnum<DatabaseType>(_databaseTypeStr, DatabaseType.MySql);
             var database = new Database(databaseType, _connectionString);
             var connection = database.GetConnection();
@@ -897,7 +897,7 @@ namespace GxPress.Repository.Implement
         //    var connection = database.GetConnection();
 
         //    var result = connection.Query<UserDetail, Department, UserDetail>(
-        //        "SELECT a.*,b.Name FROM ccpph.tede_user a inner join ccpph.tede_department b on a.DepartmentId=b.Id where a.id=@Id;",
+        //        "SELECT a.*,b.Name FROM tede_user a inner join tede_department b on a.DepartmentId=b.Id where a.id=@Id;",
         //        (userDetail,department) =>
         //        {
         //            userDetail.DepartmentName = department.Name;

+ 2 - 2
gx_api/GxPress/Repository/GxPress.Repository.Implement/Visit/VisitRepository.cs

@@ -41,7 +41,7 @@ namespace GxPress.Repository.Implement.Visit
         public async Task<PagedList<VisitResult>> GetVisitResultAsync(VisitPageSearchRequest request)
         {
             var resultData = new PagedList<VisitResult>();
-            string sql = $"SELECT a.*,b.Name,b.AvatarUrl,c.Name FROM ccpph.tede_visit a inner join ccpph.tede_user b on a.UserId=b.Id inner join ccpph.tede_department c on c.Id=b.DepartmentId where a.TypeId={request.TypeId} and a.SourceId={request.SouceId} order by a. CreatedDate desc limit {(request.Page - 1) * request.PerPage},{request.PerPage}";
+            string sql = $"SELECT a.*,b.Name,b.AvatarUrl,c.Name FROM tede_visit a inner join tede_user b on a.UserId=b.Id inner join tede_department c on c.Id=b.DepartmentId where a.TypeId={request.TypeId} and a.SourceId={request.SouceId} order by a. CreatedDate desc limit {(request.Page - 1) * request.PerPage},{request.PerPage}";
             var databaseType = StringUtils.ToEnum<DatabaseType>(_databaseTypestr, DatabaseType.MySql);
             var database = new Database(databaseType, _connectionString);
             var connection = database.GetConnection();
@@ -55,7 +55,7 @@ namespace GxPress.Repository.Implement.Visit
                             visitResult.AvatarUrl = StringUtils.AddDomainMin(user.AvatarUrl);
                             return visitResult;
                         }, splitOn: "Name");
-            var sqlCount = $"SELECT count(1) FROM ccpph.tede_visit a inner join ccpph.tede_user b on a.UserId=b.Id inner join ccpph.tede_department c on c.Id=b.DepartmentId where a.TypeId={request.TypeId} and a.SourceId={request.SouceId}";
+            var sqlCount = $"SELECT count(1) FROM tede_visit a inner join tede_user b on a.UserId=b.Id inner join tede_department c on c.Id=b.DepartmentId where a.TypeId={request.TypeId} and a.SourceId={request.SouceId}";
             resultData.Items = result;
             resultData.Total = await connection.ExecuteScalarAsync<int>(sqlCount);
             return resultData;

+ 1 - 1
gx_api/GxPress/Repository/GxPress.Repository.Implement/WorkFlow/FlowFieldValueRepository.cs

@@ -74,7 +74,7 @@ namespace GxPress.Repository.Implement.WorkFlow
         /// <returns></returns>
         public async Task<bool> IsSearchKeywordFlowFieldValue(int processId, int flowId, string keyword)
         {
-            string sql = $"SELECT count(1) FROM ccpph.tede_flow_field_value a inner join ccpph.tede_user b on a.UserId=b.Id  where a.ProcessId={processId} and a.FlowId={flowId} and  (a.StringValue like '%{keyword}%' or b.Name like '%{keyword}%')";
+            string sql = $"SELECT count(1) FROM tede_flow_field_value a inner join tede_user b on a.UserId=b.Id  where a.ProcessId={processId} and a.FlowId={flowId} and  (a.StringValue like '%{keyword}%' or b.Name like '%{keyword}%')";
             var databaseType = StringUtils.ToEnum<DatabaseType>(_databaseTypeStr, DatabaseType.MySql);
             var database = new Database(databaseType, _connectionString);
             var connection = database.GetConnection();

+ 6 - 6
gx_api/GxPress/Repository/GxPress.Repository.Implement/WorkFlow/FlowRepository.cs

@@ -104,7 +104,7 @@ namespace GxPress.Repository.Implement.WorkFlow
             string sql = $@"SELECT 
                                 count(1)
                             FROM
-                                ccpph.tede_flow a
+                                tede_flow a
                             WHERE 1=1 ";
             if (!checking)
                 sql += $@" and a.State IN ('Denied','Checked')";
@@ -114,7 +114,7 @@ namespace GxPress.Repository.Implement.WorkFlow
                                     AND a.ProcessId IN (SELECT 
                                         id
                                     FROM
-                                        ccpph.tede_process)";
+                                        tede_process)";
             if (!string.IsNullOrWhiteSpace(request.Keyword))
             {
                 sql += $@" AND (a.ProcessId IN (SELECT 
@@ -132,7 +132,7 @@ namespace GxPress.Repository.Implement.WorkFlow
                                         OR a.UserId IN (SELECT 
                                         Id
                                     FROM
-                                        ccpph.tede_user
+                                        tede_user
                                     WHERE
                                         Name LIKE '%{request.Keyword}%') or a.Id In(SELECT 
                                                                                     FlowId
@@ -238,7 +238,7 @@ namespace GxPress.Repository.Implement.WorkFlow
             string sql = $@"SELECT 
                                 a.*
                             FROM
-                                ccpph.tede_flow a  
+                                tede_flow a  
                             WHERE 1=1 ";
             if (!checking)
                 sql += $@" and a.State IN ('Denied','Checked')";
@@ -248,7 +248,7 @@ namespace GxPress.Repository.Implement.WorkFlow
                                     AND a.ProcessId IN (SELECT 
                                         id
                                     FROM
-                                        ccpph.tede_process)";
+                                        tede_process)";
             if (!string.IsNullOrWhiteSpace(request.Keyword))
             {
                 sql += $@" AND (a.ProcessId IN (SELECT 
@@ -266,7 +266,7 @@ namespace GxPress.Repository.Implement.WorkFlow
                                         OR a.UserId IN (SELECT 
                                         Id
                                     FROM
-                                        ccpph.tede_user
+                                        tede_user
                                     WHERE
                                         Name LIKE '%{request.Keyword}%') or a.Id In(SELECT 
                                                                                     FlowId

+ 21 - 21
gx_api/GxPress/Repository/GxPress.Repository.Implement/WorkFlow/FlowTodoRepository.cs

@@ -103,11 +103,11 @@ namespace GxPress.Repository.Implement.WorkFlow
             string sql = $@"SELECT 
                                 a.Id,a.FlowId
                             FROM
-                                ccpph.tede_flow_todo a
+                                tede_flow_todo a
                                     INNER JOIN
-                                ccpph.tede_process b ON a.ProcessId = b.id
+                                tede_process b ON a.ProcessId = b.id
                                     INNER JOIN
-                                ccpph.tede_flow c ON c.Id = a.FlowId
+                                tede_flow c ON c.Id = a.FlowId
                             WHERE
                                 a.UserId = {userId}
                                     AND a.Type = '{type}'";
@@ -120,13 +120,13 @@ namespace GxPress.Repository.Implement.WorkFlow
                                     OR a.FlowId IN (SELECT 
                                         FlowId
                                     FROM
-                                        ccpph.tede_flow_field_value
+                                        tede_flow_field_value
                                     WHERE
                                         StringValues LIKE '%{request.Keyword}%')
                                     OR c.UserId IN (SELECT 
                                         Id
                                     FROM
-                                        ccpph.tede_user
+                                        tede_user
                                     WHERE
                                         Name LIKE '%{request.Keyword}%') 
                                         or a.FlowId In(SELECT 
@@ -233,11 +233,11 @@ namespace GxPress.Repository.Implement.WorkFlow
             string sql = $@"SELECT 
                                count(1)
                             FROM
-                                ccpph.tede_flow_todo a
+                                tede_flow_todo a
                                     INNER JOIN
-                                ccpph.tede_process b ON a.ProcessId = b.id
+                                tede_process b ON a.ProcessId = b.id
                                     INNER JOIN
-                                ccpph.tede_flow c ON c.Id = a.FlowId
+                                tede_flow c ON c.Id = a.FlowId
                             WHERE
                                 a.UserId = {userId}
                                     AND a.Type = '{type}'";
@@ -250,13 +250,13 @@ namespace GxPress.Repository.Implement.WorkFlow
                                     OR a.FlowId IN (SELECT 
                                         FlowId
                                     FROM
-                                        ccpph.tede_flow_field_value
+                                        tede_flow_field_value
                                     WHERE
                                         StringValues LIKE '%{request.Keyword}%')
                                     OR c.UserId IN (SELECT 
                                         Id
                                     FROM
-                                        ccpph.tede_user
+                                        tede_user
                                     WHERE
                                         Name LIKE '%{request.Keyword}%') or a.FlowId In(SELECT 
                                                                                     FlowId
@@ -304,11 +304,11 @@ namespace GxPress.Repository.Implement.WorkFlow
             string sql = $@"SELECT 
                                count(1)
                             FROM
-                                ccpph.tede_flow_todo a
+                                tede_flow_todo a
                                     INNER JOIN
-                                ccpph.tede_process b ON a.ProcessId = b.id
+                                tede_process b ON a.ProcessId = b.id
                                     INNER JOIN
-                                ccpph.tede_flow c ON c.Id = a.FlowId
+                                tede_flow c ON c.Id = a.FlowId
                             WHERE
                                 a.UserId = {userId}
                                     AND a.Type = '{type}'";
@@ -321,13 +321,13 @@ namespace GxPress.Repository.Implement.WorkFlow
                                     OR a.FlowId IN (SELECT 
                                         FlowId
                                     FROM
-                                        ccpph.tede_flow_field_value
+                                        tede_flow_field_value
                                     WHERE
                                         StringValues LIKE '%{request.Keyword}%')
                                     OR c.UserId IN (SELECT 
                                         Id
                                     FROM
-                                        ccpph.tede_user
+                                        tede_user
                                     WHERE
                                         Name LIKE '%{request.Keyword}%') or a.FlowId In(SELECT 
                                                                                     FlowId
@@ -466,11 +466,11 @@ namespace GxPress.Repository.Implement.WorkFlow
             string sql = $@"SELECT 
                                 a.Id,a.FlowId
                             FROM
-                                ccpph.tede_flow_todo a
+                                tede_flow_todo a
                                     INNER JOIN
-                                ccpph.tede_process b ON a.ProcessId = b.id
+                                tede_process b ON a.ProcessId = b.id
                                     INNER JOIN
-                                ccpph.tede_flow c ON c.Id = a.FlowId
+                                tede_flow c ON c.Id = a.FlowId
                             WHERE
                                 a.UserId = {userId}
                                     AND a.Type = '{type}'";
@@ -483,13 +483,13 @@ namespace GxPress.Repository.Implement.WorkFlow
                                     OR a.FlowId IN (SELECT 
                                         FlowId
                                     FROM
-                                        ccpph.tede_flow_field_value
+                                        tede_flow_field_value
                                     WHERE
                                         StringValues LIKE '%{request.Keyword}%')
                                     OR c.UserId IN (SELECT 
                                         Id
                                     FROM
-                                        ccpph.tede_user
+                                        tede_user
                                     WHERE
                                         Name LIKE '%{request.Keyword}%') or a.FlowId In(SELECT 
                                                                                     FlowId
@@ -760,7 +760,7 @@ namespace GxPress.Repository.Implement.WorkFlow
         /// <returns></returns>
         public async Task<int> FlowCcUReadCountAsync(int userId)
         {
-            string sql = $"SELECT count(1) FROM ccpph.tede_flow_todo  a where a.UserId={userId} and a.Type='CarbonCopy' and a.IsRead=0 and a.IsDone=0 and a.ProcessId=(select Id from ccpph.tede_process where Id=a.ProcessId)";
+            string sql = $"SELECT count(1) FROM tede_flow_todo  a where a.UserId={userId} and a.Type='CarbonCopy' and a.IsRead=0 and a.IsDone=0 and a.ProcessId=(select Id from tede_process where Id=a.ProcessId)";
             var databaseType = StringUtils.ToEnum<DatabaseType>(_databaseTypeStr, DatabaseType.MySql);
             var database = new Database(databaseType, _connectionString);
             var connection = database.GetConnection();

+ 1 - 1
gx_api/GxPress/Repository/GxPress.Repository.Implement/WorkMeeting/MeetingRepository.cs

@@ -103,7 +103,7 @@ namespace GxPress.Repository.Implement.WorkMeeting
         /// <returns></returns>
         public async Task<IEnumerable<MeetingUserResult>> GetUserByMeeting(MeetingUsersRequest request)
         {
-            string sql = $"select * from ccpph.tede_user where Id in(select UserId from ccpph.tede_meeting_summary_todo where TypeId=1 and MeetingSummaryId={request.MeetingId})";
+            string sql = $"select * from tede_user where Id in(select UserId from tede_meeting_summary_todo where TypeId=1 and MeetingSummaryId={request.MeetingId})";
             if (!string.IsNullOrWhiteSpace(request.KeyWord))
             {
                 sql += $" AND (Name like '%{request.KeyWord}%' or Phone like '%{request.KeyWord}%')";

+ 6 - 6
gx_api/GxPress/Repository/GxPress.Repository.Implement/WorkMeeting/MeetingSummaryRepository.cs

@@ -97,17 +97,17 @@ namespace GxPress.Repository.Implement.WorkMeeting
         public async Task<IEnumerable<MeetingSummaryResult>> GetListMeetingSummaryResultAsync(string keyword, int userId, int typeId, int meetingId, int page = 1, int perPage = 10)
         {
             var sql = $@"SELECT 
-                                a.*,(select Address from ccpph.tede_meeting_location where Id=e.Id) as Address,(select Name from ccpph.tede_meeting where Id=a.MeetingId) as MeetingName,(select Name from ccpph.tede_user where Id=a.UserId) as UserName
+                                a.*,(select Address from tede_meeting_location where Id=e.Id) as Address,(select Name from tede_meeting where Id=a.MeetingId) as MeetingName,(select Name from tede_user where Id=a.UserId) as UserName
                             FROM
-                                ccpph.tede_meeting_summary a
+                                tede_meeting_summary a
                                     INNER JOIN
-                                ccpph.tede_meeting_summary_todo b ON a.Id = b.MeetingSummaryId
+                                tede_meeting_summary_todo b ON a.Id = b.MeetingSummaryId
                                     INNER JOIN
-                                ccpph.tede_meeting c ON a.MeetingId = c.Id
+                                tede_meeting c ON a.MeetingId = c.Id
                                     INNER JOIN
-                                ccpph.tede_meeting_room d ON c.RoomId = d.Id
+                                tede_meeting_room d ON c.RoomId = d.Id
                                     INNER JOIN
-                                ccpph.tede_meeting_location e ON d.LocationId = e.Id
+                                tede_meeting_location e ON d.LocationId = e.Id
                             WHERE
                                 b.UserId = {userId}";
             if (typeId == 1)