diff --git a/src/main/java/com/xit/biz/ctgy/repository/IResidentAndDisabledRepositoryImpl.java b/src/main/java/com/xit/biz/ctgy/repository/IResidentAndDisabledRepositoryImpl.java index 7dfeb13..c3967d1 100644 --- a/src/main/java/com/xit/biz/ctgy/repository/IResidentAndDisabledRepositoryImpl.java +++ b/src/main/java/com/xit/biz/ctgy/repository/IResidentAndDisabledRepositoryImpl.java @@ -323,11 +323,10 @@ public class IResidentAndDisabledRepositoryImpl implements IResidentAndDisabledR BooleanBuilder builder = new BooleanBuilder(); builder.and(minSimsa680Sc.msDatagb.eq(dto.getMsDatagb())); - - // TODO : test를 위하 임시로 코멘트 처리 - //builder.and(minSimsaUser680Sc.msuUserid.eq(HeaderUtil.getUserId())); + builder.and(minSimsaUser680Sc.msuUserid.eq(HeaderUtil.getUserId())); + // TODO : 테스트를 위해 임시로 코멘트 처리 // 심의전 - builder.and(minSimsa680Sc.msResult.eq(CtgyConstants.Judge.RESULT_JUDGE_PRE.getCode())); + //builder.and(minSimsa680Sc.msResult.eq(CtgyConstants.Judge.RESULT_JUDGE_PRE.getCode())); return queryFactory .select(Projections.fields( @@ -351,7 +350,7 @@ public class IResidentAndDisabledRepositoryImpl implements IResidentAndDisabledR .on(minSimsa680Sc.msMaincode.eq(minSimsaUser680Sc.msuMaincode)) .where(builder) //.groupBy(minSimsa680Sc.msDatagb, minSimsa680Sc.msYear, minSimsaUser680Sc.msuUserid, minSimsa680Sc.msChasu, minSimsa680Sc.msSdate, minSimsa680Sc.msStartsi, minSimsa680Sc.msEdate, minSimsa680Sc.msCdate, minSimsa680Sc.msClosesi) - .orderBy(minSimsa680Sc.msYear.desc(), minSimsa680Sc.msChasu.desc()) + .orderBy(minSimsa680Sc.msSdate.asc(), minSimsa680Sc.msEdate.asc(), minSimsa680Sc.msSeq.asc()) .fetch(); } } \ No newline at end of file