1

gx_api/GxPress/Repository/GxPress.Repository.Implement/OftenContactRepository.cs

@@ -283,20 +283,38 @@ namespace GxPress.Repository.Implement
         }
         public async Task<List<OftenContactInfo>> GetContactInfosAsync(OftenContactSearchRequest request)
         {
+            var chatConst = GxPress.EnumConst.AllTypeConst.Wechat.GetHashCode();
             var sql =
-               $"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";
+               $@"SELECT 
+                        a.Id,
+                        a.AttributeValue,
+                        a.FolderName,
+                        a.FolderType,
+                        b.CreatedDate,
+                        b.LastModifiedDate,
+                        b.UserId,
+                        b.ContactUserId,
+                        b.IndividualGroupId,
+                        b.UpdateTime,
+                        b.ChatType,
+                        b.IsBlack,
+                        a.IsTop,
+                        a.IsDelete
+                    FROM
+                        tede_middle a
+                            LEFT JOIN
+                        tede_often_contact b ON a.MiddleId = b.Id
+                    WHERE
+                        a.FolderType = {chatConst} 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();
             var result =
                await connection
-                    .QueryAsync<OftenContactInfo, Entity.OftenContact, OftenContactInfo>(sql,
-                        (oftenContactInfo, oftenContact) =>
-                        {
-                            oftenContactInfo.ChatType = oftenContact == null ? 0 : oftenContact.ChatType;
-                            oftenContactInfo.ContactUserId = oftenContact == null ? "" : oftenContact.ContactUserId;
-                            return oftenContactInfo;
-                        }, splitOn: "Id,Id");
+                    .QueryAsync<OftenContactInfo>(sql);
             return result.ToList();
         }
 

gx_api/GxPress/Service/GxPress.Service.Implement/OftenContact/OftenContactService.Get.cs

@@ -39,7 +39,7 @@ namespace GxPress.Service.Implement.OftenContact
                     data[i].ToUserId = user.Id;
                 }
 
-                if (data[i].ChatType == 2)
+                else if (data[i].ChatType == 2)
                 {
                     var groupChat = await _groupChatRepository.GetAsync(Q.Where(nameof(Entity.GroupChat.GroupChatImId),
                         data[i].ContactUserId));
@@ -56,6 +56,8 @@ namespace GxPress.Service.Implement.OftenContact
                     groupChatUserIsDisturbRequest.UserId = data[i].UserId;
                     data[i].IsDisturb = await groupChatUserRepository.IsDisturbAsync(groupChatUserIsDisturbRequest);
                 }
+                else
+                    data.Remove(data[i]);
             }
             result = data.ToList();
             return result;