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/mybatis/query-template/issueType-template.xml | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mybatis/query-template/issueType-template.xml b/src/main/resources/mybatis/query-template/issueType-template.xml
index b26e4d5..bacd724 100644
--- a/src/main/resources/mybatis/query-template/issueType-template.xml
+++ b/src/main/resources/mybatis/query-template/issueType-template.xml
@@ -10,7 +10,8 @@
it.description as description,
it.color as color,
it.project_id as projectId,
- it.complete_issue_status_id as completeIssueStatusId
+ it.use_partner AS usePartners,
+ it.inherit_partners as inheritPartners
FROM
issue_type it
INNER JOIN workspace ws on it.workspace_id = ws.id
@@ -18,13 +19,30 @@
<if test="name != '' and name != null">
AND it.name like CONCAT('%',#{name},'%')
</if>
+ <choose>
+ <when test="allProjectIds != null and allProjectIds.size != 0">
+ AND it.project_id IN
+ <foreach collection="allProjectIds" item="item" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </when>
+ </choose>
<if test="projectId != '' and projectId != null">
AND it.project_id like CONCAT('%',#{projectId},'%')
</if>
+ <choose>
+ <when test="downProjectIds != null and downProjectIds.size != 0">
+ OR it.project_id IN
+ <foreach collection="downProjectIds" item="item" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </when>
+ </choose>
<if test="useProject != '' and useProject != null and useProject == true">
AND it.project_id IS NOT NULL
</if>
AND ws.id = #{workspaceId}
+ ORDER BY it.register_date DESC
<if test="page != null and !page.equals('')">
limit #{pageSize} offset #{page};
</if>
--
Gitblit v1.8.0