|
|
|
@ -108,7 +108,7 @@ public class PtyGroupQueryRepository{
|
|
|
|
|
* @param cstmrSno |
|
|
|
|
* @return |
|
|
|
|
*/ |
|
|
|
|
public List<BasGroupJoinModel> joinList(int cstmrSno){ |
|
|
|
|
public List<BasGroupJoinModel> groupList(int cstmrSno){ |
|
|
|
|
QPtyGroupBas bas = QPtyGroupBas.ptyGroupBas; |
|
|
|
|
QPtyCstmrGroup dtl = QPtyCstmrGroup.ptyCstmrGroup; |
|
|
|
|
|
|
|
|
@ -147,30 +147,38 @@ public class PtyGroupQueryRepository{
|
|
|
|
|
* @param cstmrSno |
|
|
|
|
* @return |
|
|
|
|
*/ |
|
|
|
|
public List<BasGroupJoinModel> groupList(int cstmrSno){ |
|
|
|
|
public List<BasGroupJoinModel> 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<BasGroupJoinModel> 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; |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|