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

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

@@ -113,8 +113,6 @@ public class PtyGroupQueryRepository{
     	QPtyGroupBas bas = QPtyGroupBas.ptyGroupBas;
     	QPtyCstmrGroup group = QPtyCstmrGroup.ptyCstmrGroup;
     	    
-        List<BasGroupJoinModel> result = new ArrayList<>();
-        List<BasGroupJoinModel> resultList = new ArrayList<>();
 	    String appAuth = jwtTokenUtil.getUserAuthByToken();
 	    List<JwtGroupModel> groupAuth = jwtTokenUtil.getGroupAuthByToken();
     	BooleanBuilder builder = new BooleanBuilder();
@@ -122,50 +120,54 @@ public class PtyGroupQueryRepository{
     	builder.and(group.joinYn.eq("Y"));
     	builder.and(group.cstmrSno.eq(cstmrSno));
     	    
-            result = 
+    	//joinList
-                query.select(Projections.bean(BasGroupJoinModel.class , 
+    	List<BasGroupJoinModel> result = query.select(Projections.bean(BasGroupJoinModel.class ,
     			bas.groupId,
     	        bas.groupNm,
-                		group.groupAuthCd
+    	        group.groupAuthCd,
+    	        bas.createDt,
+    	        group.joinDt
     	    )).from(bas)
     	        .leftJoin(group)
     	        .on(bas.groupId.eq(group.groupId))
     	            .where(builder)
-                        .orderBy(group.joinDt.desc())
+//	                .orderBy(group.joinDt.desc())
-                        .orderBy(bas.createDt.desc())
+//	                .orderBy(bas.createDt.desc())
+    	            .orderBy(bas.groupNm.asc())
     	            .groupBy(bas.groupId)
     	            .fetch();				 
-            if(appAuth.equals("USER") || appAuth.equals("ROLE_USER")) {
+    	      
-            	return result;
+    	    //not joinList
-            }else {
+    	    List<BasGroupJoinModel> notResult = query.select(Projections.bean(BasGroupJoinModel.class , 
-            	resultList = 
-        			 query.select(Projections.bean(BasGroupJoinModel.class , 
     	       bas.groupId,
     	       bas.groupNm,
-                     		group.groupAuthCd
+    	       group.groupAuthCd,
+    	       bas.createDt
     	    )).from(bas)
     	       .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.createDt.desc())
+    	          .orderBy(bas.groupNm.asc())
     	          .groupBy(bas.groupId)
     	          .fetch();				 
     	            
-        			for(BasGroupJoinModel lists : resultList) {
+    	for(BasGroupJoinModel not : notResult) {
     	  int cnt = 0;
     	  for(JwtGroupModel list : groupAuth) {
-        					if(list.getGroupId().equals(lists.getGroupId())) {
+    	    if(list.getGroupId().equals(not.getGroupId())) {
     	      cnt++;
     	    }
     	  }
     	  if(cnt==0) {
-        					lists.setGroupAuthCd("");
+    	    not.setGroupAuthCd("");
-    						result.add(lists);
+    	    result.add(not);
-    					}
     	  }
     	}
 
+    	        
+    	        
     	    return result;
 
     	}