diff --git a/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupService.java b/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupService.java index a2362cf..904fff3 100644 --- a/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupService.java +++ b/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupService.java @@ -1,5 +1,7 @@ package com.palnet.biz.api.bas.group.service; +import java.util.Collections; +import java.util.Comparator; import java.util.List; import java.util.Optional; import java.util.UUID; @@ -10,16 +12,12 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.palnet.biz.api.anls.hstry.model.AnlsHstryModel; -import com.palnet.biz.api.anls.hstry.model.AnlsHstryRqModel; +import com.palnet.biz.api.acnt.jwt.utils.JwtTokenUtil; import com.palnet.biz.api.bas.group.model.BasGroupJoinModel; import com.palnet.biz.api.bas.group.model.BasGroupModel; import com.palnet.biz.api.bas.group.model.BasGroupRqModel; -import com.palnet.biz.jpa.entity.CtrCntrlBas; import com.palnet.biz.jpa.entity.PtyCstmrGroup; import com.palnet.biz.jpa.entity.PtyGroupBas; -import com.palnet.biz.jpa.repository.ctr.CtrCntrlBasRepository; -import com.palnet.biz.jpa.repository.ctr.CtrCntrlQueryRepository; import com.palnet.biz.jpa.repository.pty.PtyCstmrGroupRepository; import com.palnet.biz.jpa.repository.pty.PtyGroupBasRepository; import com.palnet.biz.jpa.repository.pty.PtyGroupQueryRepository; @@ -41,6 +39,9 @@ public class BasGroupService { @Autowired private PtyCstmrGroupRepository ptyCstmrGroupRepository; + @Autowired + private JwtTokenUtil jwtTokenUtil; + public String createid() { @@ -77,8 +78,24 @@ public class BasGroupService { */ public List groupList(int cstmrSno){ + String appAuth = jwtTokenUtil.getUserAuthByToken(); + List resultList = query.groupList(cstmrSno); + if("SUPER".equals(appAuth) || "ADMIN".equals(appAuth)) { + + Comparator comparator = (o1, o2) -> { + if (DateUtils.diffSecond(o1.getJoinDt(), o2.getJoinDt()) < 0) { + return -1; + } else if(DateUtils.diffSecond(o1.getJoinDt(), o2.getJoinDt()) > 0) { + return 1; + } + return 0; + }; + + Collections.sort(resultList, comparator); + } + return resultList; } diff --git a/src/main/java/com/palnet/biz/jpa/repository/pty/PtyGroupQueryRepository.java b/src/main/java/com/palnet/biz/jpa/repository/pty/PtyGroupQueryRepository.java index 942c913..df09823 100644 --- a/src/main/java/com/palnet/biz/jpa/repository/pty/PtyGroupQueryRepository.java +++ b/src/main/java/com/palnet/biz/jpa/repository/pty/PtyGroupQueryRepository.java @@ -131,7 +131,7 @@ public class PtyGroupQueryRepository{ .leftJoin(group) .on(bas.groupId.eq(group.groupId)) .where(builder) -// .orderBy(group.joinDt.desc()) + .orderBy(group.joinDt.desc()) // .orderBy(bas.createDt.desc()) .orderBy(bas.groupNm.asc()) .groupBy(bas.groupId) @@ -147,7 +147,7 @@ public class PtyGroupQueryRepository{ .leftJoin(group) .on(bas.groupId.eq(group.groupId)) .where(bas.useYn.eq("Y")) -// .orderBy(group.joinDt.desc()) + .orderBy(group.joinDt.desc()) // .orderBy(bas.createDt.desc()) .orderBy(bas.groupNm.asc()) .groupBy(bas.groupId)