승인관리 - 조건으로 검색 시 페이징과 조건 처리의 서순 변경

src/main/java/com/palnet/biz/api/bas/group/service/BasGroupAprvService.java

@@ -11,6 +11,7 @@ import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 
+import com.palnet.biz.api.anls.hstry.model.AnlsHstryModel;
 import com.palnet.biz.api.anls.hstry.model.AnlsHstryRsModel;
 import com.palnet.biz.api.bas.group.model.BasGroupAprvModel;
 import com.palnet.biz.api.bas.group.model.BasGroupAprvRqModel;
@@ -46,13 +47,13 @@ public class BasGroupAprvService {
 
 		Pageable pageable = PageRequest.of(rq.getPage()-1, rq.getRecord());
 		
-		PageImpl<BasGroupAprvModel> result = query.aprvList(rq, pageable);
+		List<BasGroupAprvModel> result = query.aprvList(rq);
 		
 		long total = query.aprvCount(rq);
 		
 		long totalPage = total % rq.getRecord() > 0 ? (total/rq.getRecord()) + 1 : total/rq.getRecord();
-
-		response.setItems(result.getContent());
+		PageImpl<BasGroupAprvModel> resultList =new PageImpl<BasGroupAprvModel>(result, pageable, result.size());
+		response.setItems(resultList.getContent());
 		response.setTotal(total);
 		response.setPage(rq.getPage());
 		response.setTotalPage(totalPage);

src/main/java/com/palnet/biz/jpa/repository/pty/PtyGroupQueryRepository.java

@@ -263,7 +263,7 @@ public class PtyGroupQueryRepository{
         
     }
     
-    public PageImpl<BasGroupAprvModel> aprvList(BasGroupAprvRqModel rq, Pageable pageable){
+    public List<BasGroupAprvModel> aprvList(BasGroupAprvRqModel rq){
     	QPtyGroupBas bas = QPtyGroupBas.ptyGroupBas;
         QPtyCstmrGroup dtl = QPtyCstmrGroup.ptyCstmrGroup;
         QPtyCstmrBas cstmr = QPtyCstmrBas.ptyCstmrBas; 
@@ -333,8 +333,8 @@ public class PtyGroupQueryRepository{
 //                        .where(dtl.groupAuthCd.ne("CREATER"))
                         .where(dtl.groupAuthCd.ne("MASTER"))
                         .orderBy(bas.createDt.desc())
-                    	.offset(pageable.getOffset())
-        				.limit(pageable.getPageSize())
+//                    	.offset(pageable.getOffset())
+//        				.limit(pageable.getPageSize())
                         .fetch();
         
         List<BasGroupAprvModel> result = new ArrayList<BasGroupAprvModel>();
@@ -346,14 +346,14 @@ public class PtyGroupQueryRepository{
         			result.add(model);
         		}
         	}
-        	return new PageImpl<>(result, pageable, result.size());
+        	return result;
         }
         for(BasGroupAprvModel model : queryResult) {
         	model.setMemberName(EncryptUtils.decrypt(model.getMemberName()));
         	result.add(model);
         }
 
-        return new PageImpl<>(result, pageable, result.size());
+        return result;
     }
     public long aprvCount(BasGroupAprvRqModel rq){
     	QPtyGroupBas bas = QPtyGroupBas.ptyGroupBas;