From 2fed2749b65c7926ab20fc45a830f5d84adaff41 Mon Sep 17 00:00:00 2001
From: jinhyuk jang <imlovee@naver.com>
Date: 일, 12 12월 2021 23:22:00 +0900
Subject: [PATCH] - 일반 사용자 로그인시 이슈유형 메뉴 정상적으로 뜨도록 수정 - 이슈 메뉴 클릭시 프로젝트에 속해 있는 사용자는 모든 이슈 보도록 수정
---
src/main/java/kr/wisestone/owl/web/form/IssueTypeForm.java | 44 +++++++++++++++++++++++++-------------------
1 files changed, 25 insertions(+), 19 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/web/form/IssueTypeForm.java b/src/main/java/kr/wisestone/owl/web/form/IssueTypeForm.java
index d903b49..0aa73e3 100644
--- a/src/main/java/kr/wisestone/owl/web/form/IssueTypeForm.java
+++ b/src/main/java/kr/wisestone/owl/web/form/IssueTypeForm.java
@@ -1,6 +1,7 @@
package kr.wisestone.owl.web.form;
import com.google.common.collect.Lists;
+import kr.wisestone.owl.constant.UsePartner;
import kr.wisestone.owl.util.ConvertUtil;
import kr.wisestone.owl.util.MapUtil;
@@ -17,10 +18,9 @@
private String color;
private Long workflowId;
private Long projectId;
- private String companyYn;
- private String ispYn;
- private String hostingYn;
+ private Long completeIssueStatusId;
private List<Long> removeIds = Lists.newArrayList();
+ private Long usePartner;
public IssueTypeForm(){}
@@ -29,6 +29,20 @@
if (MapUtil.getLongs(params, "removeIds") != null) {
form.setRemoveIds(MapUtil.getLongs(params, "removeIds"));
+ }
+
+ if (MapUtil.getLongs(params, "companyIds") != null) {
+// form.setRemoveIds(MapUtil.getLongs(params, "companyIds"));
+ List<Long> longs = MapUtil.getLongs(params, "companyIds");
+ form.usePartner = 0L;
+
+ for (Long id : longs) {
+ if (id == UsePartner.USE_PARTNER_COMPANY - 1) {
+ form.usePartner += 1;
+ } else {
+ form.usePartner += id * 2;
+ }
+ }
}
return form;
@@ -94,27 +108,19 @@
this.projectId = projectId;
}
- public String getCompanyYn() {
- return companyYn;
+ public Long getUsePartner() {
+ return usePartner;
}
- public void setCompanyYn(String companyYn) {
- this.companyYn = companyYn;
+ public void setUsePartner(Long usePartner) {
+ this.usePartner = usePartner;
}
- public String getIspYn() {
- return ispYn;
+ public Long getCompleteIssueStatusId() {
+ return completeIssueStatusId;
}
- public void setIspYn(String ispYn) {
- this.ispYn = ispYn;
- }
-
- public String getHostingYn() {
- return hostingYn;
- }
-
- public void setHostingYn(String hostingYn) {
- this.hostingYn = hostingYn;
+ public void setCompleteIssueStatusId(Long completeIssueStatusId) {
+ this.completeIssueStatusId = completeIssueStatusId;
}
}
--
Gitblit v1.8.0