|
@@ -83,7 +83,7 @@ namespace GxPress.Repository.Implement.Collection
|
|
folderUserQuery.Where("tede_folder_user.UserId", request.UserId);
|
|
folderUserQuery.Where("tede_folder_user.UserId", request.UserId);
|
|
folderUserQuery.WhereColumns("tede_folder_user.MiddleId", "=", "tede_middle.Id");
|
|
folderUserQuery.WhereColumns("tede_folder_user.MiddleId", "=", "tede_middle.Id");
|
|
folderUserQuery.Select("tede_folder_user.MiddleId");
|
|
folderUserQuery.Select("tede_folder_user.MiddleId");
|
|
- query.Where(n => n.WhereIn("tede_middle.RoleId", new List<int> { MiddleRoleConst.Publicity.GetHashCode(), MiddleRoleConst.Share.GetHashCode() }).OrWhereIn("tede_middle.Id", folderUserQuery));
|
|
|
|
|
|
+ query.Where(n => n.WhereIn("tede_middle.RoleId", new List<int> { MiddleRoleConst.Publicity.GetHashCode(), MiddleRoleConst.Share.GetHashCode(),0 }).OrWhereIn("tede_middle.Id", folderUserQuery));
|
|
}
|
|
}
|
|
if (!string.IsNullOrEmpty(request.SearchKey) && request.FolderId == 0)
|
|
if (!string.IsNullOrEmpty(request.SearchKey) && request.FolderId == 0)
|
|
query.Where(n => n.OrWhereLike("tede_collection.Title", $"%{request.SearchKey}%")
|
|
query.Where(n => n.OrWhereLike("tede_collection.Title", $"%{request.SearchKey}%")
|