From 3f9bc2c32fbc48e6c8ed18ab662226f625c6e150 Mon Sep 17 00:00:00 2001 From: Choins Date: Tue, 23 Jun 2026 12:12:10 +0900 Subject: [PATCH] =?UTF-8?q?=EC=97=85=EB=AC=B4=EC=9D=BC=EC=A7=80=20:=20?= =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A0=95=20=EA=B7=B8=EB=A3=B9=EC=9E=A5?= =?UTF-8?q?=EB=8B=98=20=ED=99=9C=EB=8F=99=EB=B9=84=20=EA=B3=84=EC=82=B0=20?= =?UTF-8?q?=EC=95=88=EB=90=98=EB=8D=98=20=EC=98=A4=EB=A5=98=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- approval/doc_expense_approval_depart.asp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/approval/doc_expense_approval_depart.asp b/approval/doc_expense_approval_depart.asp index c9af576..2de8434 100644 --- a/approval/doc_expense_approval_depart.asp +++ b/approval/doc_expense_approval_depart.asp @@ -348,7 +348,12 @@ Query = Query & " ISNULL(SUM(CASE WHEN VGC.txt_hangmok = '활동비' THEN VGC.cost ELSE 0 END), 0) AS hang9_use_cost " Query = Query & " FROM GROUP_COST_EST GCE LEFT JOIN V_GROUP_COST_NEW VGC " IF Session("User_Number") = "20150302" OR Session("User_Number") = "20210405" OR Session("User_Number") = "20191202" OR Session("User_Number") = "20031102" OR Session("N_Depart") = "E" THEN - Query = Query & " ON VGC.d_code = 'E101' AND VGC.cost_date BETWEEN GCE.st_date AND GCE.ed_date " + IF Session("User_Number") = "20191202" THEN + Query = Query & " ON VGC.d_code = 'M101'" + ELSE + Query = Query & " ON VGC.d_code = 'E101'" + END IF + Query = Query & " AND VGC.cost_date BETWEEN GCE.st_date AND GCE.ed_date " END IF 'IF Session("User_Number") = "20000201" OR Session("User_Number") = "20160205" THEN '박준성 2023-05-02 원성훈 부사장님은 특별취급 E102로 고정 ' Query = Query & " ON VGC.d_code = 'E101' AND VGC.cost_date BETWEEN GCE.st_date AND GCE.ed_date " @@ -452,8 +457,8 @@ <%If Session("User_Number") = "20150302" OR Session("User_Number") = "20210405" OR Session("User_Number") = "20191202" OR Session("User_Number") = "20031102" OR Session("N_Depart") = "E" Then %> - - + + <% else %> @@ -525,7 +530,7 @@ if session("job_code") = "08" then preGroupfeeQuery = preGroupfeeQuery & " and depart_cd = '18' and p_job_part = '08'" else - preGroupfeeQuery = preGroupfeeQuery & " and depart_cd = '18' and p_job_part <> '08' " + preGroupfeeQuery = preGroupfeeQuery & " and depart_cd = '18' and p_job_part <> '08' AND p_no <> '20191202' " end if Elseif depart_cd_string <> "" then ' 2023-05-15 박준성 파트너들이 각 그룹의 사용내역 볼 수 있게 변경 자기의 사용내역은 못 봄