|
|
@ -591,7 +591,7 @@ public class TaskService {
|
|
|
|
|
|
|
|
|
|
|
|
private static Query queryForTask(Task task, String userTableAlias, Property<?>[] activityProperties, Property<?>[] userProperties) {
|
|
|
|
private static Query queryForTask(Task task, String userTableAlias, Property<?>[] activityProperties, Property<?>[] userProperties) {
|
|
|
|
Query result = Query.select(AndroidUtilities.addToArray(activityProperties, userProperties))
|
|
|
|
Query result = Query.select(AndroidUtilities.addToArray(activityProperties, userProperties))
|
|
|
|
.where(Criterion.and(UserActivity.ACTION.eq(UserActivity.ACTION_TASK_COMMENT), UserActivity.TARGET_ID.eq(task.getUuid())));
|
|
|
|
.where(Criterion.and(UserActivity.ACTION.eq(UserActivity.ACTION_TASK_COMMENT), UserActivity.TARGET_ID.eq(task.getUuid()), UserActivity.DELETED_AT.eq(0)));
|
|
|
|
if (!TextUtils.isEmpty(userTableAlias))
|
|
|
|
if (!TextUtils.isEmpty(userTableAlias))
|
|
|
|
result = result.join(Join.left(User.TABLE.as(userTableAlias), UserActivity.USER_UUID.eq(Field.field(userTableAlias + "." + User.UUID.name)))); //$NON-NLS-1$
|
|
|
|
result = result.join(Join.left(User.TABLE.as(userTableAlias), UserActivity.USER_UUID.eq(Field.field(userTableAlias + "." + User.UUID.name)))); //$NON-NLS-1$
|
|
|
|
return result;
|
|
|
|
return result;
|
|
|
|