From 331fa1aa562297b3e0f0cce3b244d187f32910bd Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 28 12월 2021 17:59:08 +0900
Subject: [PATCH] 하위프로젝트 가져오는 코드 롤백 및 상위 프로젝트는 추가 못하도록 수정
---
src/main/resources/mybatis/query-template/project-template.xml | 98 ++++++++++---------
src/main/java/kr/wisestone/owl/service/impl/WidgetServiceImpl.java | 4
src/main/webapp/views/project/projectAdd.html | 4
src/main/webapp/views/project/projectModify.html | 4
src/main/webapp/custom_components/widget/project-progress-widget/project-progress-widget.html | 3
src/main/resources/mybatis/query-template/widget-template.xml | 168 ++++++++++++++++----------------
6 files changed, 142 insertions(+), 139 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/WidgetServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/WidgetServiceImpl.java
index 2ae3432..970ef1f 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/WidgetServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/WidgetServiceImpl.java
@@ -1197,11 +1197,11 @@
excelInfo.setFileName(this.messageAccessor.message("common.managementRisk")); // �쐞�뿕 愿�由�
excelInfo.setDatas(riskIssues);
excelInfo.addAttrInfos(new ExportExcelAttrVo("issueKey", this.messageAccessor.message("common.issueKey"), 6, ExportExcelAttrVo.ALIGN_CENTER)); // �씠�뒋 踰덊샇
- excelInfo.addAttrInfos(new ExportExcelAttrVo("riskType", this.messageAccessor.message("common.division"), 15, ExportExcelAttrVo.ALIGN_CENTER)); // 援щ텇
+ //excelInfo.addAttrInfos(new ExportExcelAttrVo("riskType", this.messageAccessor.message("common.division"), 15, ExportExcelAttrVo.ALIGN_CENTER)); // 援щ텇
excelInfo.addAttrInfos(new ExportExcelAttrVo("projectName", this.messageAccessor.message("common.project"), 15, ExportExcelAttrVo.ALIGN_LEFT)); // �봽濡쒖젥�듃
excelInfo.addAttrInfos(new ExportExcelAttrVo("title", this.messageAccessor.message("common.issueTitle"), 40, ExportExcelAttrVo.ALIGN_LEFT)); // �씠�뒋
excelInfo.addAttrInfos(new ExportExcelAttrVo("issueStatusName", this.messageAccessor.message("common.status"), 6, ExportExcelAttrVo.ALIGN_CENTER)); // �긽�깭
- excelInfo.addAttrInfos(new ExportExcelAttrVo("issueUsers", this.messageAccessor.message("common.assignee"), 20, ExportExcelAttrVo.ALIGN_CENTER)); // �떞�떦�옄
+ //excelInfo.addAttrInfos(new ExportExcelAttrVo("issueUsers", this.messageAccessor.message("common.assignee"), 20, ExportExcelAttrVo.ALIGN_CENTER)); // �떞�떦�옄
return excelInfo;
}
diff --git a/src/main/resources/mybatis/query-template/project-template.xml b/src/main/resources/mybatis/query-template/project-template.xml
index 823b0f3..cd7a94e 100644
--- a/src/main/resources/mybatis/query-template/project-template.xml
+++ b/src/main/resources/mybatis/query-template/project-template.xml
@@ -77,7 +77,7 @@
INNER JOIN user_department ud on ud.department_id = prd.department_id
INNER JOIN workspace ws on ws.id = p.workspace_id
LEFT JOIN project_closure pc ON p.id = pc.project_id
- WHERE 1=1
+ WHERE if (pc.parent_project_id > -1, pc.parent_project_id, -1) = -1
<if test="name != '' and name != null">
AND p.name like CONCAT('%',#{name},'%')
</if>
@@ -181,6 +181,7 @@
INNER JOIN workspace ws on ws.id = p.workspace_id
LEFT JOIN project_closure pc on p.id = pc.project_id
WHERE prd.department_id = ud.id
+ AND if (pc.parent_project_id > -1, pc.parent_project_id, -1) = -1
<if test="name != '' and name != null">
AND p.name like CONCAT('%',#{name},'%')
</if>
@@ -377,43 +378,43 @@
</choose>
</select>
- <!-- <select id="findByWorkspaceIdAndIncludeProjectAll" resultType="java.util.HashMap"
- parameterType="kr.wisestone.owl.web.condition.ProjectCondition">
- SELECT
- DISTINCT p.id as id,
- p.name as name,
- p.description as description,
- p.status as status,
- p.start_date as startDate,
- p.end_date as endDate,
- p.project_key as projectKey,
- CASE p.default_yn WHEN 'Y' THEN 'true' ELSE 'false' END as defaultYn
- FROM
- project p
- INNER JOIN project_role pr on p.id = pr.project_id
- INNER JOIN project_role_user pru on pru.project_role_id = pr.id
- WHERE pru.user_id = #{loginUserId}
- AND p.workspace_id = #{workspaceId}
- <if test="name != '' and name != null">
- AND p.name like CONCAT('%',#{name},'%')
- </if>
- <choose>
- <when test="statuses.size != 0">
- AND p.status IN
- <foreach collection="statuses" item="item" index="index" separator="," open="(" close=")">
- #{item}
- </foreach>
- </when>
- </choose>
- <choose>
- <when test="excludeIds.size != 0">
- AND p.id NOT IN
- <foreach collection="excludeIds" item="item" index="index" separator="," open="(" close=")">
- #{item}
- </foreach>
- </when>
- </choose>
- </select>-->
+ <!-- <select id="findByWorkspaceIdAndIncludeProjectAll" resultType="java.util.HashMap"
+ parameterType="kr.wisestone.owl.web.condition.ProjectCondition">
+ SELECT
+ DISTINCT p.id as id,
+ p.name as name,
+ p.description as description,
+ p.status as status,
+ p.start_date as startDate,
+ p.end_date as endDate,
+ p.project_key as projectKey,
+ CASE p.default_yn WHEN 'Y' THEN 'true' ELSE 'false' END as defaultYn
+ FROM
+ project p
+ INNER JOIN project_role pr on p.id = pr.project_id
+ INNER JOIN project_role_user pru on pru.project_role_id = pr.id
+ WHERE pru.user_id = #{loginUserId}
+ AND p.workspace_id = #{workspaceId}
+ <if test="name != '' and name != null">
+ AND p.name like CONCAT('%',#{name},'%')
+ </if>
+ <choose>
+ <when test="statuses.size != 0">
+ AND p.status IN
+ <foreach collection="statuses" item="item" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </when>
+ </choose>
+ <choose>
+ <when test="excludeIds.size != 0">
+ AND p.id NOT IN
+ <foreach collection="excludeIds" item="item" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </when>
+ </choose>
+ </select>-->
<!-- �빐�떦 �뾽臾� 怨듦컙�뿉�꽌 李몄뿬�븯怨� �엳�뒗 吏꾪뻾以묒씤 �봽濡쒖젥�듃瑜� 議고쉶�븳�떎 -->
<select id="findByWorkspaceIdAndIncludeProjectAll" resultType="java.util.HashMap"
@@ -564,6 +565,7 @@
INNER JOIN user_department ud on ud.department_id = prd.department_id
LEFT JOIN project_closure pc ON p.id = pc.project_id
WHERE prd.department_id = ud.department_id
+ AND if (pc.parent_project_id > -1, pc.parent_project_id, -1) = -1
AND p.workspace_id = #{workspaceId}
<if test="name != '' and name != null">
AND p.name like CONCAT('%',#{name},'%')
@@ -623,17 +625,17 @@
<select id="findChildrenProject" resultType="java.util.HashMap" parameterType="long">
SELECT
- p.id as id,
- p.name as name,
- p.description as description,
- p.status as status,
- p.start_date as startDate,
- p.end_date as endDate,
- p.project_key as projectKey,
- pc.parent_project_id as parentProjectId
+ p.id as id,
+ p.name as name,
+ p.description as description,
+ p.status as status,
+ p.start_date as startDate,
+ p.end_date as endDate,
+ p.project_key as projectKey,
+ pc.parent_project_id as parentProjectId
FROM
- project p
- LEFT JOIN project_closure pc ON p.id = pc.project_id
+ project p
+ LEFT JOIN project_closure pc ON p.id = pc.project_id
WHERE pc.parent_project_id = #{parent_project_id}
</select>
diff --git a/src/main/resources/mybatis/query-template/widget-template.xml b/src/main/resources/mybatis/query-template/widget-template.xml
index 6da8334..26e1ace 100644
--- a/src/main/resources/mybatis/query-template/widget-template.xml
+++ b/src/main/resources/mybatis/query-template/widget-template.xml
@@ -15,9 +15,9 @@
WHERE EXISTS(SELECT 1 FROM issue_status iss WHERE iss.issue_status_type != 'CLOSE' AND i.issue_status_id =
iss.id)
<choose>
- <when test="meAndDownProjectIds != null and meAndDownProjectIds.size != 0">
+ <when test="projectIds != null and projectIds.size != 0">
AND i.project_id IN
- <foreach collection="meAndDownProjectIds" item="item" index="index" separator="," open="(" close=")">
+ <foreach collection="projectIds" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</when>
@@ -33,9 +33,9 @@
WHERE EXISTS(SELECT 1 FROM issue_status iss WHERE iss.issue_status_type != 'CLOSE' AND i.issue_status_id =
iss.id)
<choose>
- <when test="meAndDownProjectIds != null and meAndDownProjectIds.size != 0">
+ <when test="projectIds != null and projectIds.size != 0">
AND i.project_id IN
- <foreach collection="meAndDownProjectIds" item="item" index="index" separator="," open="(" close=")">
+ <foreach collection="projectIds" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</when>
@@ -60,9 +60,9 @@
COUNT(i.id) FROM issue i where
exists(select 1 from issue_status iss where iss.id = i.issue_status_id and iss.issue_status_type != 'CLOSE')
<choose>
- <when test="meAndDownProjectIds != null and meAndDownProjectIds.size != 0">
+ <when test="projectIds != null and projectIds.size != 0">
AND i.project_id IN
- <foreach collection="meAndDownProjectIds" item="item" index="index" separator="," open="(" close=")">
+ <foreach collection="projectIds" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</when>
@@ -79,9 +79,9 @@
INNER JOIN user_department ud ON ud.department_id = isd.department_id
where exists(select 1 from issue_status iss where iss.id = i.issue_status_id and iss.issue_status_type != 'CLOSE')
<choose>
- <when test="meAndDownProjectIds != null and meAndDownProjectIds.size != 0">
+ <when test="projectIds != null and projectIds.size != 0">
AND i.project_id IN
- <foreach collection="meAndDownProjectIds" item="item" index="index" separator="," open="(" close=")">
+ <foreach collection="projectIds" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</when>
@@ -145,9 +145,9 @@
</choose>
) AND EXISTS(SELECT 1 FROM issue_status iss WHERE iss.id = i.issue_status_id and iss.issue_status_type != 'CLOSE')
<choose>
- <when test="meAndDownProjectIds != null and meAndDownProjectIds.size != 0">
+ <when test="projectIds != null and projectIds.size != 0">
AND i.project_id IN
- <foreach collection="meAndDownProjectIds" item="item" index="index" separator="," open="(" close=")">
+ <foreach collection="projectIds" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</when>
@@ -174,9 +174,9 @@
</choose>
) AND EXISTS(SELECT 1 FROM issue_status iss WHERE iss.id = i.issue_status_id and iss.issue_status_type != 'CLOSE')
<choose>
- <when test="meAndDownProjectIds != null and meAndDownProjectIds.size != 0">
+ <when test="projectIds != null and projectIds.size != 0">
AND i.project_id IN
- <foreach collection="meAndDownProjectIds" item="item" index="index" separator="," open="(" close=")">
+ <foreach collection="projectIds" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</when>
@@ -190,9 +190,9 @@
count(i.id) as todayCount from issue i where
i.register_id = #{loginUserId}
<choose>
- <when test="meAndDownProjectIds != null and meAndDownProjectIds.size != 0">
+ <when test="projectIds != null and projectIds.size != 0">
AND i.project_id IN
- <foreach collection="meAndDownProjectIds" item="item" index="index" separator="," open="(" close=")">
+ <foreach collection="projectIds" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</when>
@@ -209,9 +209,9 @@
where
i.register_id = #{loginUserId}
<choose>
- <when test="meAndDownProjectIds != null and meAndDownProjectIds.size != 0">
+ <when test="projectIds != null and projectIds.size != 0">
AND i.project_id IN
- <foreach collection="meAndDownProjectIds" item="item" index="index" separator="," open="(" close=")">
+ <foreach collection="projectIds" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</when>
@@ -239,9 +239,9 @@
WHERE
EXISTS(select 1 from issue_status iss where iss.id = i.issue_status_id and iss.issue_status_type != 'CLOSE')
<choose>
- <when test="meAndDownProjectIds.size != 0">
+ <when test="projectIds.size != 0">
AND i.project_id IN
- <foreach collection="meAndDownProjectIds" item="item" index="index" separator="," open="(" close=")">
+ <foreach collection="projectIds" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</when>
@@ -258,9 +258,9 @@
WHERE
EXISTS(select 1 from issue_status iss where iss.id = i.issue_status_id and iss.issue_status_type != 'CLOSE')
<choose>
- <when test="meAndDownProjectIds != null and meAndDownProjectIds.size != 0">
+ <when test="projectIds != null and projectIds.size != 0">
AND i.project_id IN
- <foreach collection="meAndDownProjectIds" item="item" index="index" separator="," open="(" close=")">
+ <foreach collection="projectIds" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</when>
@@ -276,9 +276,9 @@
WHERE
EXISTS(select 1 from issue_status iss where iss.id = i.issue_status_id and iss.issue_status_type != 'CLOSE')
<choose>
- <when test="meAndDownProjectIds != null and meAndDownProjectIds.size != 0">
+ <when test="projectIds != null and projectIds.size != 0">
AND i.project_id IN
- <foreach collection="meAndDownProjectIds" item="item" index="index" separator="," open="(" close=")">
+ <foreach collection="projectIds" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</when>
@@ -302,9 +302,9 @@
inner join issue_status iss on iss.id = i.issue_status_id
where iss.issue_status_type = 'CLOSE'
<choose>
- <when test="meAndDownProjectIds != null and meAndDownProjectIds.size != 0">
+ <when test="projectIds != null and projectIds.size != 0">
AND i.project_id IN
- <foreach collection="meAndDownProjectIds" item="item" index="index" separator="," open="(" close=")">
+ <foreach collection="projectIds" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</when>
@@ -320,9 +320,9 @@
INNER JOIN user_department ud ON ud.department_id = isd.department_id
where iss.issue_status_type = 'CLOSE'
<choose>
- <when test="meAndDownProjectIds != null and meAndDownProjectIds.size != 0">
+ <when test="projectIds != null and projectIds.size != 0">
AND i.project_id IN
- <foreach collection="meAndDownProjectIds" item="item" index="index" separator="," open="(" close=")">
+ <foreach collection="projectIds" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</when>
@@ -353,9 +353,9 @@
where iss.issue_status_type = 'CLOSE'
and i.modify_date between #{searchStartDate} and #{searchEndDate}
<choose>
- <when test="meAndDownProjectIds != null and meAndDownProjectIds.size != 0">
+ <when test="projectIds != null and projectIds.size != 0">
AND i.project_id IN
- <foreach collection="meAndDownProjectIds" item="item" index="index" separator="," open="(" close=")">
+ <foreach collection="projectIds" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</when>
@@ -370,9 +370,9 @@
inner join issue_status iss on iss.id = i.issue_status_id
where 1=1
<choose>
- <when test="meAndDownProjectIds != null and meAndDownProjectIds.size != 0">
+ <when test="projectIds != null and projectIds.size != 0">
AND i.project_id IN
- <foreach collection="meAndDownProjectIds" item="item" index="index" separator="," open="(" close=")">
+ <foreach collection="projectIds" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</when>
@@ -450,9 +450,9 @@
left outer join issue_status iss on iss.id = i.issue_status_id
WHERE 1=1
<choose>
- <when test="meAndDownProjectIds != null and meAndDownProjectIds.size != 0">
+ <when test="projectIds != null and projectIds.size != 0">
AND p.id IN
- <foreach collection="meAndDownProjectIds" item="item" index="index" separator="," open="(" close=")">
+ <foreach collection="projectIds" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</when>
@@ -564,9 +564,9 @@
and isd.register_date
BETWEEN (CURDATE()) AND (CURDATE() + INTERVAL 1 DAY))
<choose>
- <when test="meAndDownProjectIds != null and meAndDownProjectIds.size != 0">
+ <when test="projectIds != null and projectIds.size != 0">
AND i.project_id IN
- <foreach collection="meAndDownProjectIds" item="item" index="index" separator="," open="(" close=")">
+ <foreach collection="projectIds" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</when>
@@ -604,9 +604,9 @@
inner join issue_status iss on iss.id = i.issue_status_id
WHERE 1=1
<choose>
- <when test="meAndDownProjectIds != null and meAndDownProjectIds.size != 0">
+ <when test="projectIds != null and projectIds.size != 0">
AND i.project_id IN
- <foreach collection="meAndDownProjectIds" item="item" index="index" separator="," open="(" close=")">
+ <foreach collection="projectIds" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</when>
@@ -676,9 +676,9 @@
inner join project p on p.id = i.project_id
WHERE 1=1
<choose>
- <when test="meAndDownProjectIds != null and meAndDownProjectIds.size != 0">
+ <when test="projectIds != null and projectIds.size != 0">
AND p.id IN
- <foreach collection="meAndDownProjectIds" item="item" index="index" separator="," open="(" close=")">
+ <foreach collection="projectIds" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</when>
@@ -710,9 +710,9 @@
inner join project p on p.id = i.project_id
WHERE 1=1
<choose>
- <when test="meAndDownProjectIds != null and meAndDownProjectIds.size != 0">
+ <when test="projectIds != null and projectIds.size != 0">
AND p.id IN
- <foreach collection="meAndDownProjectIds" item="item" index="index" separator="," open="(" close=")">
+ <foreach collection="projectIds" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</when>
@@ -770,9 +770,9 @@
inner join issue_status iss on iss.id = i.issue_status_id
where iss.issue_status_type != 'CLOSE'
<choose>
- <when test="meAndDownProjectIds != null and meAndDownProjectIds.size != 0">
+ <when test="projectIds != null and projectIds.size != 0">
AND i.project_id IN
- <foreach collection="meAndDownProjectIds" item="item" index="index" separator="," open="(" close=")">
+ <foreach collection="projectIds" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</when>
@@ -824,9 +824,9 @@
inner join project p on p.id = i.project_id
where iss.issue_status_type != 'CLOSE'
<choose>
- <when test="meAndDownProjectIds != null and meAndDownProjectIds.size != 0">
+ <when test="projectIds != null and projectIds.size != 0">
AND p.id IN
- <foreach collection="meAndDownProjectIds" item="item" index="index" separator="," open="(" close=")">
+ <foreach collection="projectIds" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</when>
@@ -847,9 +847,9 @@
inner join issue_status iss on iss.id = i.issue_status_id
where iss.issue_status_type != 'CLOSE'
<choose>
- <when test="meAndDownProjectIds != null and meAndDownProjectIds.size != 0">
+ <when test="projectIds != null and projectIds.size != 0">
AND i.project_id IN
- <foreach collection="meAndDownProjectIds" item="item" index="index" separator="," open="(" close=")">
+ <foreach collection="projectIds" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</when>
@@ -886,9 +886,9 @@
WHERE 1=1
AND i.register_id = #{loginUserId}
<choose>
- <when test="meAndDownProjectIds != null and meAndDownProjectIds.size != 0">
+ <when test="projectIds != null and projectIds.size != 0">
AND i.project_id IN
- <foreach collection="meAndDownProjectIds" item="item" index="index" separator="," open="(" close=")">
+ <foreach collection="projectIds" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</when>
@@ -917,9 +917,9 @@
AND EXISTS (SELECT 1 FROM issue_status iss WHERE iss.id = i.issue_status_id AND iss.issue_status_type != 'CLOSE')
</if>
<choose>
- <when test="meAndDownProjectIds != null and meAndDownProjectIds.size != 0">
+ <when test="projectIds != null and projectIds.size != 0">
AND i.project_id IN
- <foreach collection="meAndDownProjectIds" item="item" index="index" separator="," open="(" close=")">
+ <foreach collection="projectIds" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</when>
@@ -956,9 +956,9 @@
</if>
WHERE 1=1
<choose>
- <when test="meAndDownProjectIds != null and meAndDownProjectIds.size != 0">
+ <when test="projectIds != null and projectIds.size != 0">
AND i.project_id IN
- <foreach collection="meAndDownProjectIds" item="item" index="index" separator="," open="(" close=")">
+ <foreach collection="projectIds" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</when>
@@ -982,9 +982,9 @@
</if>
WHERE 1=1
<choose>
- <when test="meAndDownProjectIds != null and meAndDownProjectIds.size != 0">
+ <when test="projectIds != null and projectIds.size != 0">
AND i.project_id IN
- <foreach collection="meAndDownProjectIds" item="item" index="index" separator="," open="(" close=")">
+ <foreach collection="projectIds" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</when>
@@ -1020,9 +1020,9 @@
inner join issue_status iss on iss.id = i.issue_status_id
where 1=1
<choose>
- <when test="meAndDownProjectIds != null and meAndDownProjectIds.size != 0">
+ <when test="projectIds != null and projectIds.size != 0">
AND i.project_id IN
- <foreach collection="meAndDownProjectIds" item="item" index="index" separator="," open="(" close=")">
+ <foreach collection="projectIds" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</when>
@@ -1050,9 +1050,9 @@
INNER JOIN user_department ud ON ud.department_id = isd.department_id
where 1=1
<choose>
- <when test="meAndDownProjectIds != null and meAndDownProjectIds.size != 0">
+ <when test="projectIds != null and projectIds.size != 0">
AND i.project_id IN
- <foreach collection="meAndDownProjectIds" item="item" index="index" separator="," open="(" close=")">
+ <foreach collection="projectIds" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</when>
@@ -1125,9 +1125,9 @@
inner join project p on p.id = pr.project_id
WHERE
<choose>
- <when test="meAndDownProjectIds != null and meAndDownProjectIds.size != 0">
+ <when test="projectIds != null and projectIds.size != 0">
p.id IN
- <foreach collection="meAndDownProjectIds" item="item" index="index" separator="," open="(" close=")">
+ <foreach collection="projectIds" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</when>
@@ -1160,9 +1160,9 @@
inner join project p on p.id = pr.project_id
WHERE
<choose>
- <when test="meAndDownProjectIds != null and meAndDownProjectIds.size != 0">
+ <when test="projectIds != null and projectIds.size != 0">
p.id IN
- <foreach collection="meAndDownProjectIds" item="item" index="index" separator="," open="(" close=")">
+ <foreach collection="projectIds" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</when>
@@ -1195,9 +1195,9 @@
'CLOSE') AND
i.register_id = #{loginUserId}
<choose>
- <when test="meAndDownProjectIds != null and meAndDownProjectIds.size != 0">
+ <when test="projectIds != null and projectIds.size != 0">
AND i.project_id IN
- <foreach collection="meAndDownProjectIds" item="item" index="index" separator="," open="(" close=")">
+ <foreach collection="projectIds" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</when>
@@ -1213,9 +1213,9 @@
'CLOSE')
AND i.register_id = #{loginUserId}
<choose>
- <when test="meAndDownProjectIds != null and meAndDownProjectIds.size != 0">
+ <when test="projectIds != null and projectIds.size != 0">
AND i.project_id IN
- <foreach collection="meAndDownProjectIds" item="item" index="index" separator="," open="(" close=")">
+ <foreach collection="projectIds" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</when>
@@ -1260,9 +1260,9 @@
</choose>
and iss.issue_status_type = 'CLOSE'
<choose>
- <when test="meAndDownProjectIds != null and meAndDownProjectIds.size != 0">
+ <when test="projectIds != null and projectIds.size != 0">
AND i.project_id IN
- <foreach collection="meAndDownProjectIds" item="item" index="index" separator="," open="(" close=")">
+ <foreach collection="projectIds" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</when>
@@ -1307,9 +1307,9 @@
</otherwise>
</choose>
<choose>
- <when test="meAndDownProjectIds != null and meAndDownProjectIds.size != 0">
+ <when test="projectIds != null and projectIds.size != 0">
AND i.project_id IN
- <foreach collection="meAndDownProjectIds" item="item" index="index" separator="," open="(" close=")">
+ <foreach collection="projectIds" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</when>
@@ -1327,9 +1327,9 @@
INNER JOIN issue_type ON issue.issue_type_id = issue_type.id
WHERE 1=1
<choose>
- <when test="meAndDownProjectIds != null and meAndDownProjectIds.size != 0">
+ <when test="projectIds != null and projectIds.size != 0">
AND issue.project_id IN
- <foreach collection="meAndDownProjectIds" item="item" index="index" separator="," open="(" close=")">
+ <foreach collection="projectIds" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</when>
@@ -1376,9 +1376,9 @@
WHERE w.id = #{workspaceId}
AND iss.issue_status_type != 'CLOSE'
<choose>
- <when test="meAndDownProjectIds != null and meAndDownProjectIds.size != 0">
+ <when test="projectIds != null and projectIds.size != 0">
AND i.project_id IN
- <foreach collection="meAndDownProjectIds" item="item" index="index" separator="," open="(" close=")">
+ <foreach collection="projectIds" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</when>
@@ -1402,9 +1402,9 @@
WHERE w.id = #{workspaceId}
AND iss.issue_status_type != 'CLOSE'
<choose>
- <when test="meAndDownProjectIds != null and meAndDownProjectIds.size != 0">
+ <when test="projectIds != null and projectIds.size != 0">
AND i.project_id IN
- <foreach collection="meAndDownProjectIds" item="item" index="index" separator="," open="(" close=")">
+ <foreach collection="projectIds" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</when>
@@ -1446,9 +1446,9 @@
AND s.id = #{severityId}
AND iss.issue_status_type != 'CLOSE'
<choose>
- <when test="meAndDownProjectIds != null and meAndDownProjectIds.size != 0">
+ <when test="projectIds != null and projectIds.size != 0">
AND i.project_id IN
- <foreach collection="meAndDownProjectIds" item="item" index="index" separator="," open="(" close=")">
+ <foreach collection="projectIds" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</when>
@@ -1483,9 +1483,9 @@
AND s.id = #{severityId}
AND iss.issue_status_type != 'CLOSE'
<choose>
- <when test="meAndDownProjectIds != null and meAndDownProjectIds.size != 0">
+ <when test="projectIds != null and projectIds.size != 0">
AND i.project_id IN
- <foreach collection="meAndDownProjectIds" item="item" index="index" separator="," open="(" close=")">
+ <foreach collection="projectIds" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</when>
@@ -1519,9 +1519,9 @@
AND s.id = #{severityId}
AND iss.issue_status_type != 'CLOSE'
<choose>
- <when test="meAndDownProjectIds != null and meAndDownProjectIds.size != 0">
+ <when test="projectIds != null and projectIds.size != 0">
AND i.project_id IN
- <foreach collection="meAndDownProjectIds" item="item" index="index" separator="," open="(" close=")">
+ <foreach collection="projectIds" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</when>
@@ -1541,9 +1541,9 @@
AND s.id = #{severityId}
AND iss.issue_status_type != 'CLOSE'
<choose>
- <when test="meAndDownProjectIds != null and meAndDownProjectIds.size != 0">
+ <when test="projectIds != null and projectIds.size != 0">
AND i.project_id IN
- <foreach collection="meAndDownProjectIds" item="item" index="index" separator="," open="(" close=")">
+ <foreach collection="projectIds" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</when>
diff --git a/src/main/webapp/custom_components/widget/project-progress-widget/project-progress-widget.html b/src/main/webapp/custom_components/widget/project-progress-widget/project-progress-widget.html
index fd50b40..ced2084 100644
--- a/src/main/webapp/custom_components/widget/project-progress-widget/project-progress-widget.html
+++ b/src/main/webapp/custom_components/widget/project-progress-widget/project-progress-widget.html
@@ -98,7 +98,8 @@
<span translate="common.issue">�씠�뒋</span>
</th>
<th class="text-center width-80-p">
- <span translate="dashboard.teamMember">���썝</span>
+ <!--<span translate="dashboard.teamMember">���썝</span>-->
+ <span translate="dashboard.teamDepartment">遺��꽌</span>
</th>
<th class="text-center width-80-p">
<span translate="common.period">湲곌컙</span>
diff --git a/src/main/webapp/views/project/projectAdd.html b/src/main/webapp/views/project/projectAdd.html
index d9933ff..d2315af 100644
--- a/src/main/webapp/views/project/projectAdd.html
+++ b/src/main/webapp/views/project/projectAdd.html
@@ -84,7 +84,7 @@
</div>
</div>
</div>
- <div class="col-lg-6">
+ <!--<div class="col-lg-6">
<div class="form-group mb10">
<label> <span translate="common.parentProject">�긽�쐞 �봽濡쒖젥�듃</span></label>
<js-autocomplete-single data-input-name="project"
@@ -99,7 +99,7 @@
type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }">
</js-autocomplete-single>
</div>
- </div>
+ </div>-->
</div>
diff --git a/src/main/webapp/views/project/projectModify.html b/src/main/webapp/views/project/projectModify.html
index d280b60..4a10814 100644
--- a/src/main/webapp/views/project/projectModify.html
+++ b/src/main/webapp/views/project/projectModify.html
@@ -50,7 +50,7 @@
</div>
</div>
</div>
- <div class="col-lg-6">
+ <!--<div class="col-lg-6">
<div class="form-group mb10">
<label> <span translate="common.parentProject">�긽�쐞 �봽濡쒖젥�듃</span></label>
<js-autocomplete-single data-input-name="project"
@@ -65,7 +65,7 @@
type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }">
</js-autocomplete-single>
</div>
- </div>
+ </div>-->
</div>
<div class="form-group">
<label><span translate="project.projectStatus">�봽濡쒖젥�듃 �긽�깭</span> <code class="highlighter-rouge">*</code></label>
--
Gitblit v1.8.0