1

gx_api/GxPress/Repository/GxPress.Repository.Implement/GroupRepository.cs

@@ -135,6 +135,7 @@ namespace GxPress.Repository.Implement
         public async Task<PagedList<GroupUserFindResult>> FindGroupByGroupFolderId(GroupSearchRequest request)
         {
             var pagedList = new PagedList<GroupUserFindResult>();
+            var groupConst = AllTypeConst.Group.GetHashCode();
             //根据文件夹ID查询成员
             var sqlValue = "";
             // if (!string.IsNullOrEmpty(request.Key))
@@ -168,7 +169,7 @@ namespace GxPress.Repository.Implement
             else
                 sql += $" and (a.FolderName like '%{request.Key}%' or b.Name like '%{request.Key}%')";
             sql +=
-                $@" and a.UserId=@userId and a.FolderType=7 and a.IsDelete=0 {sqlValue} and (b.id>0 or a.AttributeValue=2) ORDER BY a.IsTop DESC, a.LastModifiedDate DESC ,a.AttributeValue DESC LIMIT  @page , @pageSize";
+                $@" and a.UserId=@userId and a.FolderType={groupConst} and a.IsDelete=0 {sqlValue} and (b.id>0 or a.AttributeValue=2) ORDER BY a.IsTop DESC, a.LastModifiedDate DESC ,a.AttributeValue DESC LIMIT  @page , @pageSize";
             var databaseType = StringUtils.ToEnum<DatabaseType>(_databaseTypeStr, DatabaseType.MySql);
             var database = new Database(databaseType, _connectionString);
             var connection = database.GetConnection();
@@ -202,7 +203,7 @@ namespace GxPress.Repository.Implement
             else
                 sql += $" and (a.FolderName like '%{request.Key}%' or b.Name like '%{request.Key}%')";
             sqlCount +=
-                $" and a.UserId={request.UserId} and a.FolderType=7 and a.IsDelete=0 {sqlValue} and (b.id>0 or a.AttributeValue=2)";
+                $" and a.UserId={request.UserId} and a.FolderType={groupConst} and a.IsDelete=0 {sqlValue} and (b.id>0 or a.AttributeValue=2)";
             pagedList.Total = await FindGroupByGroupFolderIdCountAsync(sqlCount);
             return pagedList;
         }
@@ -258,7 +259,7 @@ namespace GxPress.Repository.Implement
             //获取当前用户的权限
             groupDetailResult.GroupUserRoleId = groupUser != null ? groupUser.GroupUserRoleId : 0;
             groupDetailResult.IsUDisturb = groupUser != null ? groupUser.IsUDisturb : false;
-            groupDetailResult.IsAdmin = groupUser != null ? groupUser.UserId == groupDetailResult.UserId : false;
+            //groupDetailResult.IsAdmin = groupUser != null ? groupUser.UserId == groupDetailResult.UserId : false;
             groupDetailResult.IsUser = groupUser != null ? groupUser.UserId == request.UserId : false;
             groupDetailResult.CreatedDate = groupDetail.CreatedDate;
             return groupDetailResult;