From 1fac1465cdef9f3b4573edf1869af120c5cbee79 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 15 12월 2021 15:27:07 +0900
Subject: [PATCH] api 이슈 추가시 업체/isp/호스팅에 해당 도메인이 포함되면 해당 업체 자동 입력
---
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 67 ++++++++++++++++++++++++++++++++-
1 files changed, 65 insertions(+), 2 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
index 485a1d9..d259bbe 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -82,6 +82,15 @@
private ApiTokenService apiTokenService;
@Autowired
+ private CompanyFieldService companyFieldService;
+
+ @Autowired
+ private IspFieldService ispFieldService;
+
+ @Autowired
+ private HostingFieldService hostingFieldService;
+
+ @Autowired
private CommonConfiguration configuration;
@Autowired
@@ -282,6 +291,8 @@
// �궗�슜�옄 �젙�쓽 �븘�뱶 �꽕�젙
issueForm.setIssueCustomFields(issueApiForm.getCustomFieldValues());
+ // 媛숈� �룄硫붿씤 �뾽泥� 李얘린
+ this.findCompanyField(issueForm);
// api �엯�젰媛� �쟻�슜
ConvertUtil.copyProperties(issueApiForm, issueForm);
@@ -290,6 +301,51 @@
} else {
throw new OwlRuntimeException(this.messageAccessor.getMessage(MsgConstants.API_USER_ERROR));
+ }
+ }
+
+ private void findCompanyField(IssueForm issueForm) {
+ if(issueForm.getIssueCustomFields() != null && issueForm.getIssueCustomFields().size() > 0) {
+ CompanyFieldCondition condition = new CompanyFieldCondition();
+ List<Map<String, Object>> companyFields = this.companyFieldService.find(condition);
+ List<Map<String, Object>> issueCompanyFields = Lists.newArrayList();
+ List<Map<String, Object>> issueIspFields = Lists.newArrayList();
+ List<Map<String, Object>> issueHostingFields = Lists.newArrayList();
+
+ for (Map<String, Object> issueCustomField : issueForm.getIssueCustomFields()) {
+ int customFieldId = (Integer) issueCustomField.get("customFieldId");
+ Long customId = (long) customFieldId;
+ CustomField customField = this.customFieldService.getCustomField(customId);
+ if(customField != null && customField.getCustomFieldType().toString().equals("SITE") && customField.getName().equals("�룄硫붿씤")) {
+ String useValue = issueCustomField.get("useValue").toString();
+ if(companyFields != null && companyFields.size() > 0) {
+ for (Map<String, Object> companyField : companyFields) {
+ CompanyFieldVo companyFieldVo = ConvertUtil.convertMapToClass(companyField, CompanyFieldVo.class);
+ if(useValue.equals(companyFieldVo.getUrl())) {
+ companyField.put("companyId", companyField.get("id"));
+ issueCompanyFields.add(companyField);
+ if(companyFieldVo.getIspId() != null) {
+ Map<String, Object> ispField = this.ispFieldService.find(companyFieldVo.getIspId());
+ if (ispField != null) {
+ ispField.put("ispId", ispField.get("id"));
+ issueIspFields.add(ispField);
+ }
+ }
+ if(companyFieldVo.getHostingId() != null) {
+ Map<String, Object> hostingField = this.hostingFieldService.find(companyFieldVo.getHostingId());
+ if (hostingField != null) {
+ hostingField.put("hostingId", hostingField.get("id"));
+ issueHostingFields.add(hostingField);
+ }
+ }
+ }
+ }
+ }
+ }
+ issueForm.setIssueCompanyFields(issueCompanyFields);
+ issueForm.setIssueIspFields(issueIspFields);
+ issueForm.setIssueHostingFields(issueHostingFields);
+ }
}
}
@@ -776,7 +832,7 @@
UserLevel userLevel = this.userLevelService.getUserLevel(user.getUserLevel().getId());
if (this.userWorkspaceService.checkWorkspaceManager(user)
- || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE_PROJECT_ALL)) {
+ || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE)) {
this.SetAllDepartmentId(issueCondition);
} else{
this.SetMyDepartmentId(issueCondition);
@@ -1138,7 +1194,7 @@
List<Map<String, Object>> projects = null;
UserLevel userLevel = this.userLevelService.getUserLevel(user.getUserLevel().getId());
if (this.userWorkspaceService.checkWorkspaceManager(user)
- || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE_PROJECT_ALL)) {
+ || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE)) {
projects = this.projectMapper.findByWorkspaceManagerAll(projectCondition);
} else {
projects = this.projectService.findByWorkspaceIdAndIncludeProjectAll(projectCondition);
@@ -1996,6 +2052,8 @@
hasPermission = this.checkIssueModifyPermission(hasPermission, Issue.WORKSPACE_MANAGER, issueVo, null, null, user);
// �봽濡쒖젥�듃 愿�由ъ옄�씪 寃쎌슦 �빐�떦 �봽濡쒖젥�듃�뿉 �벑濡앸맂 �씠�뒋�뒗 �닔�젙 沅뚰븳�쓣 媛뽯뒗�떎.
hasPermission = this.checkIssueModifyPermission(hasPermission, Issue.PROJECT_MANAGER, issueVo, null, null, user);
+ // �씠�뒋 愿�由ъ옄�씪 寃쎌슦 �닔�젙 沅뚰븳�쓣 媛뽯뒗�떎.
+ hasPermission = this.checkIssueModifyPermission(hasPermission, Issue.ISSUE_MANAGER, issueVo, null, null, user);
// �씠�뒋 �벑濡앹옄�씪 寃쎌슦 �닔�젙 沅뚰븳�쓣 媛뽯뒗�떎.
hasPermission = this.checkIssueModifyPermission(hasPermission, Issue.REGISTER, issueVo, null, null, user);
// �씠�뒋 �떞�떦�옄�씪 寃쎌슦 �닔�젙 沅뚰븳�쓣 媛뽯뒗�떎.
@@ -2025,6 +2083,11 @@
hasPermission = this.projectRoleUserService.checkProjectManager(issue.getProject(), user);
break;
+ case Issue.ISSUE_MANAGER: // �씠�뒋 愿�由ъ옄
+ UserLevel userLevel = this.userLevelService.getUserLevel(user.getUserLevel().getId());
+ hasPermission = MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE);
+ break;
+
case Issue.REGISTER: // �씠�뒋 �벑濡앹옄
hasPermission = issueVo.getRegisterId().equals(user.getId());
break;
--
Gitblit v1.8.0