From e7c0ff25749d77b25fdad019861c1a5a444b21dd Mon Sep 17 00:00:00 2001 From: wyu <kknd09321@nate.com> Date: 금, 26 11월 2021 00:36:48 +0900 Subject: [PATCH] 언어팩 수정, 간단한 오류 수정 [프론트] --- src/main/java/kr/wisestone/owl/service/impl/IssueTableConfigServiceImpl.java | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueTableConfigServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueTableConfigServiceImpl.java index b39658c..7712b2d 100644 --- a/src/main/java/kr/wisestone/owl/service/impl/IssueTableConfigServiceImpl.java +++ b/src/main/java/kr/wisestone/owl/service/impl/IssueTableConfigServiceImpl.java @@ -113,10 +113,9 @@ private void detailMultipleCode(Map<String, Object> resJsonData, Long issueId, int issueTableType) { // �빐�떦 �뾽臾� 怨듦컙�뿉�꽌 �궗�슜�옄�쓽 �씠�뒋 寃��깋 議곌굔�쓣 議고쉶�븳�떎. IssueTableConfig issueTableConfig = this.findByUserIdAndWorkspaceIdAndIssueIdAndIssueTableType(issueId, issueTableType); - IssueTableConfig saveIssueTableType = this.findByIssueIdAndIssueTableType(issueId,issueTableType); if (issueTableConfig != null) { - resJsonData.put(Constants.RES_KEY_CONTENTS, saveIssueTableType.getIssueTableConfigs()); + resJsonData.put(Constants.RES_KEY_CONTENTS, issueTableConfig.getIssueTableConfigs()); } else { resJsonData.put(Constants.RES_KEY_CONTENTS, ""); @@ -129,20 +128,31 @@ public void detailIssueTableConfig(Map<String, Object> resJsonData) { issueId = (long) -1; issueTableType = 1; - this.detailMultipleCode(resJsonData, issueId, issueTableType); + // �빐�떦 �뾽臾� 怨듦컙�뿉�꽌 �궗�슜�옄�쓽 �씠�뒋 寃��깋 議곌굔�쓣 議고쉶�븳�떎. + IssueTableConfig issueTableConfig = this.findByUserIdAndWorkspaceIdAndIssueIdAndIssueTableType(issueId, issueTableType); + + if (issueTableConfig != null) { + resJsonData.put(Constants.RES_KEY_CONTENTS, issueTableConfig.getIssueTableConfigs()); + } + else { + resJsonData.put(Constants.RES_KEY_CONTENTS, ""); + } } // ���옣�맂 �뿰愿� �씠�뒋 �뀒�씠釉� �꽕�젙 議고쉶 @Override - public void detailRelationIssueTableConfig(Long issueId, Map<String, Object> resJsonData) { + public void detailRelationIssueTableConfig(Map<String, Object> params, Map<String, Object> resJsonData) { issueTableType = 2; + issueId = MapUtil.getLong(params, "issueId"); this.detailMultipleCode(resJsonData, issueId, issueTableType); } // ���옣�맂 �븯�쐞 �씠�뒋 �뀒�씠釉� �꽕�젙 議고쉶 @Override - public void detailDownIssueTableConfig(Long issueId, Map<String, Object> resJsonData) { + public void detailDownIssueTableConfig(Map<String, Object> params, Map<String, Object> resJsonData) { issueTableType = 3; + issueId = MapUtil.getLong(params, "issueId"); this.detailMultipleCode(resJsonData, issueId, issueTableType); } + } -- Gitblit v1.8.0