|
|
|
@ -104,7 +104,7 @@ public class PtyGroupQueryRepository{
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 나의 그룹 - 참여 그룹 목록 |
|
|
|
|
* 그룹 목록 |
|
|
|
|
* @param cstmrSno |
|
|
|
|
* @return |
|
|
|
|
*/ |
|
|
|
@ -112,11 +112,13 @@ public class PtyGroupQueryRepository{
|
|
|
|
|
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.joinYn.eq("Y")); |
|
|
|
|
builder.and(dtl.cstmrSno.eq(cstmrSno)); |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
List<BasGroupJoinModel> result = |
|
|
|
|
query.select(Projections.bean(BasGroupJoinModel.class , |
|
|
|
|
bas.groupId, |
|
|
|
@ -136,6 +138,7 @@ public class PtyGroupQueryRepository{
|
|
|
|
|
.where(builder) |
|
|
|
|
.orderBy(dtl.joinDt.desc()) |
|
|
|
|
.orderBy(bas.createDt.desc()) |
|
|
|
|
.groupBy(bas.groupId) |
|
|
|
|
.fetch(); |
|
|
|
|
|
|
|
|
|
return result; |
|
|
|
@ -143,20 +146,19 @@ public class PtyGroupQueryRepository{
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 그룹 목록 |
|
|
|
|
* 나의 그룹 - 참여 그룹 목록 |
|
|
|
|
* @param cstmrSno |
|
|
|
|
* @return |
|
|
|
|
*/ |
|
|
|
|
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.joinYn.eq("Y")); |
|
|
|
|
builder.and(dtl.cstmrSno.eq(cstmrSno)); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
List<BasGroupJoinModel> result = |
|
|
|
|
query.select(Projections.bean(BasGroupJoinModel.class , |
|
|
|
|
bas.groupId, |
|
|
|
@ -176,7 +178,6 @@ public class PtyGroupQueryRepository{
|
|
|
|
|
.where(builder) |
|
|
|
|
.orderBy(dtl.joinDt.desc()) |
|
|
|
|
.orderBy(bas.createDt.desc()) |
|
|
|
|
.groupBy(bas.groupId) |
|
|
|
|
.fetch(); |
|
|
|
|
|
|
|
|
|
return result; |
|
|
|
|