diff --git a/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupService.java b/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupService.java index 2c0b546..ad1dacb 100644 --- a/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupService.java +++ b/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupService.java @@ -75,9 +75,9 @@ public class BasGroupService { * @param rq * @return */ - public List joinList(int cstmrSno){ + public List groupList(int cstmrSno){ - List resultList = query.joinList(cstmrSno); + List resultList = query.groupList(cstmrSno); return resultList; } @@ -87,9 +87,9 @@ public class BasGroupService { * @param rq * @return */ - public List groupList(int cstmrSno){ + public List joinList(int cstmrSno){ - List resultList = query.groupList(cstmrSno); + List resultList = query.joinList(cstmrSno); return resultList; } diff --git a/src/main/java/com/palnet/biz/jpa/repository/pty/PtyGroupQueryRepository.java b/src/main/java/com/palnet/biz/jpa/repository/pty/PtyGroupQueryRepository.java index 07886e5..9f69d95 100644 --- a/src/main/java/com/palnet/biz/jpa/repository/pty/PtyGroupQueryRepository.java +++ b/src/main/java/com/palnet/biz/jpa/repository/pty/PtyGroupQueryRepository.java @@ -108,7 +108,7 @@ public class PtyGroupQueryRepository{ * @param cstmrSno * @return */ - public List joinList(int cstmrSno){ + public List groupList(int cstmrSno){ QPtyGroupBas bas = QPtyGroupBas.ptyGroupBas; QPtyCstmrGroup dtl = QPtyCstmrGroup.ptyCstmrGroup; @@ -147,30 +147,38 @@ public class PtyGroupQueryRepository{ * @param cstmrSno * @return */ - public List groupList(int cstmrSno){ + public List joinList(int cstmrSno){ QPtyGroupBas bas = QPtyGroupBas.ptyGroupBas; QPtyCstmrGroup dtl = QPtyCstmrGroup.ptyCstmrGroup; - String appAuth = jwtTokenUtil.getUserAuthByToken(); BooleanBuilder builder = new BooleanBuilder(); builder.and(bas.useYn.eq("Y")); - - if(appAuth.equals("USER") || appAuth.equals("ROLE_USER")) { - builder.and(dtl.cstmrSno.eq(cstmrSno)); builder.and(dtl.joinYn.eq("Y")); + builder.and(dtl.cstmrSno.eq(cstmrSno)); } List result = query.select(Projections.bean(BasGroupJoinModel.class , bas.groupId, - bas.groupNm + bas.groupNm, + bas.groupTypeCd, + dtl.cstmrSno, + dtl.cstmrGroupSno, + bas.updateDt, + bas.createDt, + dtl.aprvlYn, + dtl.joinDt, + dtl.aprvlDt, + dtl.groupAuthCd )).from(bas) .leftJoin(dtl) .on(bas.groupId.eq(dtl.groupId)) .where(builder) + .orderBy(dtl.joinDt.desc()) .orderBy(bas.createDt.desc()) + .groupBy(bas.groupId) .fetch(); - + return result; }