|
|
|
@ -365,36 +365,35 @@ public class PtyGroupQueryRepository{
|
|
|
|
|
* @param rq |
|
|
|
|
* @return |
|
|
|
|
*/ |
|
|
|
|
public List<BasGroupUserModel> userList(BasGroupUserRqModel rq){ |
|
|
|
|
public List<BasGroupUserModel> 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));
|
|
|
|
|