diff --git a/wrenchboard/src/shared_tool/jobs_manager.cc b/wrenchboard/src/shared_tool/jobs_manager.cc index d07729ff..ba41c728 100644 --- a/wrenchboard/src/shared_tool/jobs_manager.cc +++ b/wrenchboard/src/shared_tool/jobs_manager.cc @@ -292,6 +292,8 @@ long WrenchJobManagerActiveTasksList(CVars in, CVars &out) { mapf1 = pgsql_fetch_assoc(res0, 0); CVars res0; map_to_cvars(f1, res0); + snprintf(extra_filter, sizeof (extra_filter), " AND mc.client_id = %lu ",res0["client_id"].Long()); + } } @@ -303,8 +305,8 @@ long WrenchJobManagerActiveTasksList(CVars in, CVars &out) { " WHEN mc.status = 1 AND mc.delivery_date now() " - " ORDER BY mc.id DESC LIMIT %lu OFFSET %lu", in["member_id"].Long(), limit, offset); + " WHERE mc.member_id =%lu %s AND mc.status IN (1,2,4) AND mc.delivery_date > now() " + " ORDER BY mc.id DESC LIMIT %lu OFFSET %lu", in["member_id"].Long(),extra_filter, limit, offset); //ORDER BY id DESC LIMIT %lu OFFSET %lu", in["member_id"].Long(), limit, offset); if (res != NULL && pgsql_num_rows(res) > 0) { out["total_record"] = pgsql_num_rows(res);