Merge branch 'master' of http://gitea.palntour.com/pav/pav-server

src/main/java/com/palnet/biz/api/anls/hstry/service/AnlsHstryService.java

@@ -76,7 +76,6 @@ public class AnlsHstryService {
 		}
 
 		ComnPagingRs<AnlsHstryRsModel> response = new ComnPagingRs<>();
-		List<AnlsHstryRsModel> returnList = new ArrayList<>();
 		
 
 		Pageable pageable = PageRequest.of(rq.getPage()-1, rq.getRecord());

src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightService.java

@@ -90,18 +90,21 @@ public class BasFlightService {
         List<BasGroupJoinModel> groupList = ptyPlanQueryRepository.joinList(rq.getCstmrSno());
         String userAccount = null;
         String masterAccount = null;
+        String appAuth = jwtTokenUtil.getUserAuthByToken();
+
         for(BasGroupJoinModel list : groupList) {
         	if(list.getGroupId().equals(rq.getGroupId())) {
         		userAccount = list.getGroupAuthCd();
 //        		if(userAccount.equals("CREATER")||userAccount.equals("ADMIN")) {
-        			if(userAccount.equals("MASTER")||userAccount.equals("LEADER")) {
-        			masterAccount = userAccount;
+        			if(userAccount.equals("MASTER")||userAccount.equals("LEADER") || appAuth.equals("USER") || appAuth.equals("ROLE_USER")) {
+        			masterAccount = "ADMIN";
         		}else {
 //        			masterAccount = "USER";
         			masterAccount = "NORMAL";
         		}
         	}
         }
+        log.info("masterAccount :  >>>>> {}" , appAuth);
         return fltPlanQueryRepository.listPlan(rq, masterAccount);
     }
 

src/main/java/com/palnet/biz/api/bas/group/controller/BasGroupController.java

@@ -91,7 +91,7 @@ public class BasGroupController {
 	}
 	
 	/**
-	 * 참여 그룹 목록 조회
+	 * 나의 그룹 - 참여 그룹 목록 조회
 	 * @param rq
 	 * @return
 	 */
@@ -110,6 +110,36 @@ public class BasGroupController {
         	result = service.joinList(cstmrSno);
         			
 			
+        } catch (Exception e) {
+			log.error("IGNORE : {}", e);
+			return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+					.body(new ErrorResponse("Server Error", "-1"));
+
+		}
+		return ResponseEntity.ok().body(new SuccessResponse<List>(result));
+
+	}
+	
+	/**
+	 * 그룹 목록 조회
+	 * @param rq
+	 * @return
+	 */
+	@GetMapping(value = "/grouplist")
+	public ResponseEntity<? extends BasicResponse> grouplist(Integer cstmrSno) {
+		List<BasGroupJoinModel> result = null;
+		
+		
+		//입력값 검증
+		if(StringUtils.isEmpty(cstmrSno)) {
+			return ResponseEntity.status(HttpStatus.OK)
+					.body(new ErrorResponse(RSErrorCode.ER_PARAM));
+		}
+		
+        try {
+        	result = service.groupList(cstmrSno);
+        			
+			
         } catch (Exception e) {
 			log.error("IGNORE : {}", e);
 			return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)

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

@@ -71,7 +71,7 @@ public class BasGroupService {
 	}
 	
 	/**
-	 * 참여 그룹 목록
+	 * 나의 그룹 - 참여 그룹 목록
 	 * @param rq
 	 * @return
 	 */
@@ -82,6 +82,17 @@ public class BasGroupService {
 		return resultList;
 	}
 	
+	/**
+	 * 그룹 목록
+	 * @param rq
+	 * @return
+	 */
+	public List<BasGroupJoinModel> groupList(int cstmrSno){
+		
+		List<BasGroupJoinModel> resultList = query.groupList(cstmrSno);
+		
+		return resultList;
+	}
 	
 	/**
 	 * 전체 그룹 목록

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

@@ -104,7 +104,7 @@ public class PtyGroupQueryRepository{
     }
     
     /**
-     * 참여 중인 그룹 목록
+     * 나의 그룹 - 참여 그룹 목록
      * @param cstmrSno
      * @return
      */
@@ -112,11 +112,10 @@ public class PtyGroupQueryRepository{
     	QPtyGroupBas bas = QPtyGroupBas.ptyGroupBas;
         QPtyCstmrGroup dtl = QPtyCstmrGroup.ptyCstmrGroup;
         
-
         BooleanBuilder builder = new BooleanBuilder();
         builder.and(bas.useYn.eq("Y"));
-        builder.and(dtl.cstmrSno.eq(cstmrSno));
         builder.and(dtl.joinYn.eq("Y"));
+        builder.and(dtl.cstmrSno.eq(cstmrSno));
         
         List<BasGroupJoinModel> result = 
                 query.select(Projections.bean(BasGroupJoinModel.class , 
@@ -142,6 +141,40 @@ public class PtyGroupQueryRepository{
         return result;
 
     }
+    
+    /**
+     * 그룹 목록
+     * @param cstmrSno
+     * @return
+     */
+    public List<BasGroupJoinModel> groupList(int cstmrSno){
+    	QPtyGroupBas bas = QPtyGroupBas.ptyGroupBas;
+        QPtyCstmrGroup dtl = QPtyCstmrGroup.ptyCstmrGroup;
+        
+        String appAuth = jwtTokenUtil.getUserAuthByToken();
+        BooleanBuilder builder = new BooleanBuilder();
+        builder.and(bas.useYn.eq("Y"));
+
+        
+        if(appAuth.equals("USER") || appAuth.equals("ROLE_USER")) {
+        builder.and(dtl.cstmrSno.eq(cstmrSno));
+        builder.and(dtl.joinYn.eq("Y"));
+        }
+        List<BasGroupJoinModel> result = 
+                query.select(Projections.bean(BasGroupJoinModel.class , 
+                		bas.groupId,
+                		bas.groupNm
+        				)).from(bas)
+                		.leftJoin(dtl)
+                		.on(bas.groupId.eq(dtl.groupId))
+                        .where(builder)
+                        .orderBy(bas.createDt.desc())
+                        .fetch();
+
+        return result;
+
+    }
+    
     /**
      * 참여할 그룹 목록
      * @param cstmrSno