diff --git a/src/main/java/com/palnet/biz/api/bas/group/model/BasGroupJoinModel.java b/src/main/java/com/palnet/biz/api/bas/group/model/BasGroupJoinModel.java index 853d209..39e6f49 100644 --- a/src/main/java/com/palnet/biz/api/bas/group/model/BasGroupJoinModel.java +++ b/src/main/java/com/palnet/biz/api/bas/group/model/BasGroupJoinModel.java @@ -30,5 +30,7 @@ public class BasGroupJoinModel { private Date createDt; private Date updateDt; + + private String myGrouopAuthCd; } 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 ddc3fbe..4069258 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 @@ -20,6 +20,7 @@ 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.jpa.entity.FltPlanArea; import com.palnet.biz.jpa.entity.QPtyCstmrBas; import com.palnet.biz.jpa.entity.QPtyCstmrDtl; import com.palnet.biz.jpa.entity.QPtyCstmrGroup; @@ -140,11 +141,39 @@ public class PtyGroupQueryRepository{ .orderBy(bas.createDt.desc()) .orderBy(bas.groupNm.asc()) .groupBy(bas.groupId) - .fetch(); + .fetch(); + + BooleanBuilder builder2 = new BooleanBuilder(); + builder2.and(bas.useYn.eq("Y")); + builder2.and(group.cstmrGroupSno.isNotNull()); + + List my = query.select(Projections.bean(BasGroupUserModel.class , + bas.groupId, + bas.groupNm, + group.cstmrGroupSno, + group.cstmrSno, + group.groupAuthCd + )).from(bas) + .where(builder2) + .leftJoin(group) + .on(bas.groupId.eq(group.groupId)) + .on(group.cstmrSno.eq(cstmrSno)) + .groupBy(bas.groupId) + .fetch(); - return result; - + + for(BasGroupJoinModel groupList: result) { + for(BasGroupUserModel myList: my) { + if(groupList.getGroupId().equals(myList.getGroupId())) { + groupList.setMyGrouopAuthCd(myList.getGroupAuthCd()); + } + } } + + + return result; + + } public List groupUserList(int cstmrSno){ QPtyGroupBas bas = QPtyGroupBas.ptyGroupBas;