From bdb1efdc604fce543e21152b4263a9362f64389f Mon Sep 17 00:00:00 2001
From: minhee <alsdldlfrl@gmail.com>
Date: 목, 10 3월 2022 15:35:19 +0900
Subject: [PATCH] - api 이슈 추가 시 입력한 ip에 속해있는 업체정보를 가진 이슈의 하위로 입력되도록 수정 - issue_company 테이블에 ip 컬럼 추가 및 이슈 추가/수정 시 ip 대역대 항목 추가

---
 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