|
|
|
@@ -391,6 +391,7 @@ open class DashboardService( |
|
|
|
+ " left join project p on s.id = p.teamLead" |
|
|
|
+ " where t.deleted = 0" |
|
|
|
+ " and p.status not in (\"Pending to Start\",\"Completed\",\"Deleted\")" |
|
|
|
+ " and p.deleted = false " |
|
|
|
) |
|
|
|
|
|
|
|
if (viewDashboardAuthority() == "self") { |
|
|
|
@@ -476,11 +477,12 @@ open class DashboardService( |
|
|
|
+ " ) AS subquery" |
|
|
|
+ " GROUP BY pid" |
|
|
|
+ " ORDER BY comingPaymentMilestone ASC" |
|
|
|
+ " ) milestonePayment on milestonePayment.pid = p.id" |
|
|
|
+ " ) milestonePayment on milestonePayment.pid = p.id " |
|
|
|
+ " WHERE p.deleted = false " |
|
|
|
|
|
|
|
) |
|
|
|
if (args["teamLeadId"] != null && args["teamLeadId"].toString().toInt() > 0) { |
|
|
|
sql.append(" WHERE p.teamLead = :teamLeadId") |
|
|
|
sql.append(" and p.teamLead = :teamLeadId") |
|
|
|
} |
|
|
|
sql.append(" and p.status not in (\"Pending to Start\",\"Completed\",\"Deleted\")" |
|
|
|
// + " and (tg.name != '5. Miscellaneous' or tg.name is null)" |
|
|
|
|
