From 23eb90bb1966d755db23025489fc56a75dac6d2a Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 목, 04 11월 2021 18:55:10 +0900 Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa --- src/main/java/kr/wisestone/owl/service/impl/UserWorkspaceServiceImpl.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/kr/wisestone/owl/service/impl/UserWorkspaceServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/UserWorkspaceServiceImpl.java index d41c05c..405cfe5 100644 --- a/src/main/java/kr/wisestone/owl/service/impl/UserWorkspaceServiceImpl.java +++ b/src/main/java/kr/wisestone/owl/service/impl/UserWorkspaceServiceImpl.java @@ -80,12 +80,12 @@ condition.setPage(pageable.getPageNumber() * pageable.getPageSize()); condition.setPageSize(pageable.getPageSize()); condition.setWorkspaceId(myWorkspace.getId()); - condition.setAccount(CommonUtil.encryptAES128(condition.getAccount())); + condition.setAccount(CommonUtil.encryptAES128(condition.getAccount())); //怨꾩젙 �븫�샇�솕(�븘�닔 �룞�옉) List<Map<String, Object>> results = this.userWorkspaceMapper.find(condition); Long totalCount = this.userWorkspaceMapper.count(condition); int totalPage = (int) Math.ceil((totalCount - 1) / pageable.getPageSize()) + 1; - List<UserWorkspaceVo> userWorkspaceVos = ConvertUtil.convertListToListClass(results, UserWorkspaceVo.class); + List<UserWorkspaceVo> userWorkspaceVos = ConvertUtil.convertListToListClass(results, UserWorkspaceVo.class); //UserWorkspace�쓽 �뜲�씠�꽣瑜� 由ъ뒪�듃 �삎�떇�쑝濡� 蹂듭궗�빐�꽌 UserWorkspaceVo�뿉 �떞湲� for (UserWorkspaceVo userWorkspaceVo : userWorkspaceVos) { userWorkspaceVo.setAccount(CommonUtil.decryptAES128(userWorkspaceVo.getAccount())); -- Gitblit v1.8.0