From 62170f092e8c8031559acf66f54d5abc87cb13cd Mon Sep 17 00:00:00 2001 From: 박지현 <jhpark@maprex.co.kr> Date: 수, 23 2월 2022 17:44:41 +0900 Subject: [PATCH] 워크플로우 상태 목록 선택 시 상태이름(상태속성) 으로표시되도록 수정 완료 --- src/main/resources/META-INF/orm.xml | 23 ++++++++++++++++++++++- 1 files changed, 22 insertions(+), 1 deletions(-) diff --git a/src/main/resources/META-INF/orm.xml b/src/main/resources/META-INF/orm.xml index 0fb4ead..5812c2b 100644 --- a/src/main/resources/META-INF/orm.xml +++ b/src/main/resources/META-INF/orm.xml @@ -42,7 +42,8 @@ <query> SELECT u FROM User u - WHERE u.permission > 2047 + INNER JOIN u.userLevel ul + WHERE ul.permission >= ?1 AND u.status = '01' </query> </named-query> @@ -182,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