From e54a8cf6c62658ff3ce9edad95f5757a7ad92d09 Mon Sep 17 00:00:00 2001 From: "MSI\\2Fi" Date: Wed, 11 Dec 2024 15:12:24 +0800 Subject: [PATCH] update project status by team query issue --- .../com/ffii/tsms/modules/data/service/DashboardService.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/ffii/tsms/modules/data/service/DashboardService.kt b/src/main/java/com/ffii/tsms/modules/data/service/DashboardService.kt index 60714a4..548fe7c 100644 --- a/src/main/java/com/ffii/tsms/modules/data/service/DashboardService.kt +++ b/src/main/java/com/ffii/tsms/modules/data/service/DashboardService.kt @@ -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)"