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 56e5e4a..c51ba0f 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 @@ -41,7 +41,7 @@ open class DashboardService( + " from customer c" + " left join customer_subsidiary cs on c.id = cs.customerId" + " left join subsidiary s on cs.subsidiaryId = s.id" - + " left join project p on cs.id = p.customerSubsidiaryId" + + " left join project p on cs.customerId = p.customerId and cs.subsidiaryId = p.customerSubsidiaryId " + " where c.deleted = 0" ) if (args != null) {