From 6aef521094d2f20da8d56a2cd820e551787fd4af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?qkr7828=28=EB=B0=95=EC=9E=AC=EC=9A=B0=29?= <박재우@DESKTOP-EF7ECBO> Date: Tue, 4 Oct 2022 16:37:08 +0900 Subject: [PATCH] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=EA=B4=80=EB=A6=AC?= =?UTF-8?q?=20=EA=B7=B8=EB=A3=B9=ED=99=94=20=EC=9E=91=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BasGroupUserController.java | 3 +- .../group/model/BasGroupUserListModel.java | 13 +++++++ .../group/service/BasGroupUserService.java | 3 +- .../pty/PtyGroupQueryRepository.java | 39 +++++++++---------- 4 files changed, 36 insertions(+), 22 deletions(-) create mode 100644 src/main/java/com/palnet/biz/api/bas/group/model/BasGroupUserListModel.java diff --git a/src/main/java/com/palnet/biz/api/bas/group/controller/BasGroupUserController.java b/src/main/java/com/palnet/biz/api/bas/group/controller/BasGroupUserController.java index 488f658..9b30357 100644 --- a/src/main/java/com/palnet/biz/api/bas/group/controller/BasGroupUserController.java +++ b/src/main/java/com/palnet/biz/api/bas/group/controller/BasGroupUserController.java @@ -23,6 +23,7 @@ import com.palnet.biz.api.anls.hstry.model.AnlsHstryModel; import com.palnet.biz.api.anls.hstry.model.AnlsHstryRqModel; import com.palnet.biz.api.anls.hstry.service.AnlsHstryService; import com.palnet.biz.api.bas.flight.model.BasFlightPlanAreaModel; +import com.palnet.biz.api.bas.group.model.BasGroupUserListModel; import com.palnet.biz.api.bas.group.model.BasGroupUserModel; import com.palnet.biz.api.bas.group.model.BasGroupUserRqModel; import com.palnet.biz.api.bas.group.service.BasGroupUserService; @@ -47,7 +48,7 @@ public class BasGroupUserController { @GetMapping(value = "/list") - public ResponseEntity list(BasGroupUserRqModel rq) { + public ResponseEntity list(BasGroupUserListModel rq) { List result = null; if(StringUtils.isEmpty(rq.getCstmrSno())) { diff --git a/src/main/java/com/palnet/biz/api/bas/group/model/BasGroupUserListModel.java b/src/main/java/com/palnet/biz/api/bas/group/model/BasGroupUserListModel.java new file mode 100644 index 0000000..cfb4f45 --- /dev/null +++ b/src/main/java/com/palnet/biz/api/bas/group/model/BasGroupUserListModel.java @@ -0,0 +1,13 @@ +package com.palnet.biz.api.bas.group.model; + +import lombok.Data; + +@Data +public class BasGroupUserListModel{ + + private String memberName; + + private String groupId; + + private int cstmrSno; +} diff --git a/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupUserService.java b/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupUserService.java index 53ad634..7033a66 100644 --- a/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupUserService.java +++ b/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupUserService.java @@ -17,6 +17,7 @@ import com.palnet.biz.api.bas.flight.model.BasFlightPlanAreaModel; import com.palnet.biz.api.bas.group.model.BasGroupJoinModel; import com.palnet.biz.api.bas.group.model.BasGroupModel; import com.palnet.biz.api.bas.group.model.BasGroupRqModel; +import com.palnet.biz.api.bas.group.model.BasGroupUserListModel; import com.palnet.biz.api.bas.group.model.BasGroupUserModel; import com.palnet.biz.api.bas.group.model.BasGroupUserRqModel; import com.palnet.biz.jpa.entity.CtrCntrlBas; @@ -53,7 +54,7 @@ public class BasGroupUserService { * @param rq * @return */ - public List list(BasGroupUserRqModel rq){ + public List list(BasGroupUserListModel rq){ List resultList = query.userList(rq); 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 9f69d95..2023794 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 @@ -365,36 +365,35 @@ public class PtyGroupQueryRepository{ * @param rq * @return */ - public List userList(BasGroupUserRqModel rq){ + public List userList(BasGroupUserListModel rq){ QPtyGroupBas bas = QPtyGroupBas.ptyGroupBas; QPtyCstmrGroup dtl = QPtyCstmrGroup.ptyCstmrGroup; QPtyCstmrBas cstmr = QPtyCstmrBas.ptyCstmrBas; QPtyCstmrDtl cstmrDtl = QPtyCstmrDtl.ptyCstmrDtl; BooleanBuilder builder = new BooleanBuilder(); - String appAuth = jwtTokenUtil.getUserAuthByToken(); builder.and(bas.useYn.eq("Y")); builder.and(dtl.joinYn.eq("Y")); builder.and(dtl.aprvlYn.eq("Y")); - - if(appAuth.equals("USER") || appAuth.equals("ROLE_USER")) { - builder.and(bas.groupId.in( - JPAExpressions - .select(bas.groupId) - .from(bas) - .leftJoin(dtl) - .on(bas.groupId.eq(dtl.groupId)) - .where(bas.useYn.eq("Y")) - .where(dtl.cstmrSno.eq(rq.getCstmrSno())) - .where(dtl.groupAuthCd.eq("MASTER").or(dtl.groupAuthCd.eq("LEADER"))) - - )); - } - if(!StringUtils.isEmpty(rq.getGroupNm())) { - builder.and(bas.groupNm.like("%" + rq.getGroupNm() + "%")); - } - + builder.and(bas.groupId.eq(rq.getGroupId())); +// if(appAuth.equals("USER") || appAuth.equals("ROLE_USER")) { +// builder.and(bas.groupId.in( +// JPAExpressions +// .select(bas.groupId) +// .from(bas) +// .leftJoin(dtl) +// .on(bas.groupId.eq(dtl.groupId)) +// .where(bas.useYn.eq("Y")) +// .where(dtl.cstmrSno.eq(rq.getCstmrSno())) +// .where(dtl.groupAuthCd.eq("MASTER").or(dtl.groupAuthCd.eq("LEADER"))) +// +// )); +// } +// if(!StringUtils.isEmpty(rq.getGroupNm())) { +// builder.and(bas.groupNm.like("%" + rq.getGroupNm() + "%")); +// } +// // if(!StringUtils.isEmpty(rq.getMemberName())) { // String memberName = EncryptUtils.encrypt(rq.getMemberName()); // builder.and(cstmrDtl.memberName.eq(memberName));