|
|
|
@ -164,10 +164,9 @@ public List<AnlsHstryRsModel> listCntrlBasRs(AnlsHstryGroupModel rq, int cstmrSn
|
|
|
|
|
|
|
|
|
|
if(userAccount.equals("USER")) { |
|
|
|
|
builder.and(qFltPlanBasEntity.cstmrSno.eq(cstmrSno)); |
|
|
|
|
log.debug(" ===> USER "); |
|
|
|
|
builder.and(qComArcrftBasEntity.groupId.eq(rq.getGroupId())); |
|
|
|
|
} else { |
|
|
|
|
builder.and(qComArcrftBasEntity.groupId.eq(rq.getGroupId())); |
|
|
|
|
log.debug(" ===> ADMIN or CREATER "); |
|
|
|
|
} |
|
|
|
|
if(rq.getStDate() != null) { |
|
|
|
|
builder.and(qCntrlBasEntity.cntrlStDt.after(DateUtils.stringToDate(rq.getStDate()))); |
|
|
|
|