From cc1832b7aa8a7d88ab0c6c9ce58a44c822ead8a1 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 14 12월 2021 19:41:18 +0900
Subject: [PATCH] 이슈 상태변경 오류 수정
---
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 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 324bb9e..bcff046 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -915,15 +915,19 @@
public void findApiIssue(ApiMonitorCondition apiMonitorCondition, Map<String, Object> resJsonData) {
IssueTypeCondition issueTypeCondition = new IssueTypeCondition();
+ issueTypeCondition.setIsApi(Issue.IS_API_YES);
List<IssueTypeVo> issueTypes = this.issueTypeService.findIssueType(issueTypeCondition);
- // 媛믪씠 �뾾�쓣 寃쎌슦 珥덇린媛� �엯�젰
- if (StringUtils.isEmpty(apiMonitorCondition.getSearchPeriod())) {
- apiMonitorCondition.setSearchPeriod(DateUtil.LAST_SEVEN_DAYS);
- }
-
// 寃��깋 �씪�옄瑜� 援ы븳�떎.
- List<Date> searchDates = CommonUtil.findSearchPeriod(apiMonitorCondition.getSearchPeriod());
+ List<Date> searchDates = Lists.newArrayList();
+ if (apiMonitorCondition.getSearchPeriod().equals(DateUtil.CUSTOM_INPUT)) {
+ Date startDate = DateUtil.convertStrToDate(apiMonitorCondition.getSearchStartDate(), "yyyy-MM-dd");
+ Date endDate = DateUtil.addDays(DateUtil.convertStrToDate(apiMonitorCondition.getSearchEndDate(), "yyyy-MM-dd"), 1);
+
+ searchDates = CommonUtil.findSearchPeriod(startDate, endDate);
+ } else {
+ searchDates = CommonUtil.findSearchPeriod(apiMonitorCondition.getSearchPeriod());
+ }
// �궇吏쒓� 寃��깋�릺吏� �븡�븯�쑝硫� �삤瑜�
if (searchDates.size() < 1) {
@@ -1132,7 +1136,9 @@
// �봽濡쒖젥�듃瑜� �꽑�깮�븯吏� �븡�븯�쑝硫� �빐�떦 �뾽臾� 怨듦컙�뿉�꽌 李몄뿬�븯怨� �엳�뒗 �봽濡쒖젥�듃瑜� 李얜뒗�떎.
if (condition.getProjectIds().size() < 1) {
List<Map<String, Object>> projects = null;
- if (this.userWorkspaceService.checkWorkspaceManager(user)) {
+ UserLevel userLevel = this.userLevelService.getUserLevel(user.getUserLevel().getId());
+ if (this.userWorkspaceService.checkWorkspaceManager(user)
+ || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE_PROJECT_ALL)) {
projects = this.projectMapper.findByWorkspaceManagerAll(projectCondition);
} else {
projects = this.projectService.findByWorkspaceIdAndIncludeProjectAll(projectCondition);
--
Gitblit v1.8.0