From f56a8597b4e99b766785d70e76291a374193049f Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 10 1월 2022 09:39:31 +0900
Subject: [PATCH] 이슈 수정 오류 수정
---
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 35 +++++++++++++++++++++++------------
1 files changed, 23 insertions(+), 12 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 935974a..5b36ce4 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -1487,14 +1487,16 @@
issueVo = ConvertUtil.copyProperties(issue, IssueVo.class);
User user = this.webAppUtil.getLoginUserObject();
-
- issueVo.setRelPageNumber(relPageable.getPageNumber());
- issueVo.setRelPageSize(relPageable.getPageSize());
- issueVo.setRelPage(relPageable.getPageNumber() * relPageable.getPageSize());
-
- issueVo.setDownPageNumber(downPageable.getPageNumber());
- issueVo.setDownPage(downPageable.getPageNumber() * downPageable.getPageSize());
- issueVo.setDownPageSize(downPageable.getPageSize());
+ if (relPageable != null) {
+ issueVo.setRelPageNumber(relPageable.getPageNumber());
+ issueVo.setRelPageSize(relPageable.getPageSize());
+ issueVo.setRelPage(relPageable.getPageNumber() * relPageable.getPageSize());
+ }
+ if (downPageable != null) {
+ issueVo.setDownPageNumber(downPageable.getPageNumber());
+ issueVo.setDownPage(downPageable.getPageNumber() * downPageable.getPageSize());
+ issueVo.setDownPageSize(downPageable.getPageSize());
+ }
switch (issueCondition.getDeep()) {
case "01": // �봽濡쒖젥�듃, �씠�뒋 �쑀�삎, �씠�뒋 �긽�깭, �슦�꽑�닚�쐞, 以묒슂�룄, �떞�떦遺��꽌, 泥⑤��뙆�씪, �궗�슜�옄 �젙�쓽 �븘�뱶 �젙蹂대�� �뀑�똿�븳�떎.
@@ -3862,17 +3864,26 @@
@Override
public void findPartner(Map<String, Object> resJsonData, Map<String, Object> params) {
Long issueTypeId = MapUtil.getLong(params, "issueTypeId");
- IssueType issueType = this.issueTypeService.getIssueType(issueTypeId); // �씠�뒋�쓽 �씠�뒋�쑀�삎 媛앹껜
- Integer using = issueType.getUsePartner() != null ? issueType.getUsePartner().intValue() : 0; // �씠�뒋�쑀�삎蹂꾨줈 �궗�슜以묒씤 �뾽泥�/ISP/�샇�뒪�똿 媛�
-
List<UsePartnerVo> usePartnerVos = Lists.newArrayList();
+ Integer using = 0;
+
+ if (issueTypeId != null) {
+ IssueType issueType = this.issueTypeService.getIssueType(issueTypeId); // �씠�뒋�쓽 �씠�뒋�쑀�삎 媛앹껜
+ using = issueType.getUsePartner() != null ? issueType.getUsePartner().intValue() : 0; // �씠�뒋�쑀�삎蹂꾨줈 �궗�슜以묒씤 �뾽泥�/ISP/�샇�뒪�똿 媛�
+ } else {
+ for (int partner : UsePartner.partners) {
+ using += partner;
+ }
+ }
+
for (Integer usePartner : UsePartner.partners) { //1(�뾽泥�), 2(ISP), 4(�샇�뒪�똿)
UsePartnerVo usePartnerVo = UsePartner.checkUsePartner(using, usePartner);
if (usePartnerVo != null) {
usePartnerVos.add(usePartnerVo);
}
- resJsonData.put(Constants.RES_KEY_CONTENTS, usePartnerVos);
}
+
+ resJsonData.put(Constants.RES_KEY_CONTENTS, usePartnerVos);
}
@Override
--
Gitblit v1.8.0