|
@@ -373,12 +373,7 @@ namespace GxPress.Repository.Implement
|
|
|
if (!string.IsNullOrEmpty(groupIdStr))
|
|
|
{
|
|
|
groupIdStr = groupIdStr.Remove(groupIdStr.Length - 1, 1);
|
|
|
- sqlStr += $@" AND a.GroupId IN (SELECT
|
|
|
- GroupId
|
|
|
- FROM
|
|
|
- tede_group_user
|
|
|
- WHERE
|
|
|
- UserId ={request.UserId} AND GroupId In ({groupIdStr}))";
|
|
|
+ sqlStr += $@" AND a.GroupId IN ({groupIdStr})";
|
|
|
}
|
|
|
}
|
|
|
if (!string.IsNullOrEmpty(request.Key))
|
|
@@ -458,11 +453,11 @@ namespace GxPress.Repository.Implement
|
|
|
d.Name as DepartmentName
|
|
|
FROM
|
|
|
tede_topic a
|
|
|
- INNER JOIN
|
|
|
+ left JOIN
|
|
|
tede_group b ON a.GroupId = b.Id
|
|
|
- INNER JOIN
|
|
|
+ left JOIN
|
|
|
tede_user c ON c.Id = a.UserId
|
|
|
- INNER JOIN
|
|
|
+ left JOIN
|
|
|
tede_department d ON d.Id = c.DepartmentId
|
|
|
WHERE
|
|
|
a.GroupId > 0
|