|
@@ -3043,8 +3043,7 @@ open class ReportService( |
|
|
" left join customer_subsidiary cs on cs.id = p.customerSubsidiaryId " + |
|
|
" left join customer_subsidiary cs on cs.id = p.customerSubsidiaryId " + |
|
|
" left join subsidiary s2 on s2.id = cs.subsidiaryId " + |
|
|
" left join subsidiary s2 on s2.id = cs.subsidiaryId " + |
|
|
" left join tsmsdb.team t on t.teamLead = p.teamLead " + |
|
|
" left join tsmsdb.team t on t.teamLead = p.teamLead " + |
|
|
" where ISNULL(p.code) = False " + |
|
|
|
|
|
" order by p.code" |
|
|
|
|
|
|
|
|
" where ISNULL(p.code) = False " |
|
|
) |
|
|
) |
|
|
|
|
|
|
|
|
if (clientId != null) { |
|
|
if (clientId != null) { |
|
@@ -3065,6 +3064,7 @@ open class ReportService( |
|
|
" and p.teamLead = :teamLeadId " |
|
|
" and p.teamLead = :teamLeadId " |
|
|
) |
|
|
) |
|
|
} |
|
|
} |
|
|
|
|
|
sql.append(" order by p.code ") |
|
|
|
|
|
|
|
|
val args = mapOf( |
|
|
val args = mapOf( |
|
|
"clientId" to clientId, |
|
|
"clientId" to clientId, |
|
|