รวม code แก้ไขหลายจุด

This commit is contained in:
Nakorn Rientrakrunchai
2020-08-16 10:08:59 +07:00
parent e5b3a20670
commit 592a3e3c1b
8 changed files with 32 additions and 19 deletions

View File

@@ -429,7 +429,8 @@ left join public.{0}DepartmentData{0} orgdata2 on orgdata2.id = detail.parent_de
left join public.org_type_departments as org_type_depart on orgdata.department_type_id = org_type_depart.id
left join public.org_type_department_colors as org_depart_color
on org_type_depart.department_degree_id = org_depart_color.id
where orgdata.department_name is not null
where orgdata.department_name is not null
and orgdata.deleted_at is null and orgdata2.deleted_at is null
order by case
when org_type_depart.department_degree_id = 1 then orgdata.department_code::int*1000
when detail.parent_department_id is not null and detail.parent_department_id>0