From b1d7844cb525a36b1e0e193e9e96a2531d4badeb Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 화, 22 2월 2022 14:23:26 +0900 Subject: [PATCH] - 이슈유형 설정에 상위 이슈 업체/ISP/호스팅 상속 기능 - 워크플로우에 속해있는 부서 삭제 시 팝업 메시지 수정 --- src/main/resources/META-INF/orm.xml | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/src/main/resources/META-INF/orm.xml b/src/main/resources/META-INF/orm.xml index 6a31acf..5812c2b 100644 --- a/src/main/resources/META-INF/orm.xml +++ b/src/main/resources/META-INF/orm.xml @@ -43,8 +43,7 @@ SELECT u FROM User u INNER JOIN u.userLevel ul - INNER JOIN u.departmentManagement dm - WHERE ul.permission > 2047 + WHERE ul.permission >= ?1 AND u.status = '01' </query> </named-query> @@ -184,6 +183,26 @@ </query> </named-query> + <named-query name="WorkflowTransition.findBySourceIssueStatusIdAndTargetIssueStatusIdAndWorkflowId"> + <query> + SELECT new kr.wisestone.owl.vo.WorkflowTransitionVo( + wt.id + , sis.id + , sis.name + , tis.id + , tis.name + , wt.correctX + , wt.correctY + , wt.direct + ) + FROM WorkflowTransition wt + INNER JOIN wt.workflow w + INNER JOIN wt.sourceIssueStatus sis + INNER JOIN wt.targetIssueStatus tis + WHERE (sis.id = ?1 OR tis.id = ?1) AND w.id = ?2 + </query> + </named-query> + </entity-mappings> -- Gitblit v1.8.0