사용자관리 그룹화 작업

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

@@ -23,6 +23,7 @@ import com.palnet.biz.api.anls.hstry.model.AnlsHstryModel;
 import com.palnet.biz.api.anls.hstry.model.AnlsHstryRqModel;
 import com.palnet.biz.api.anls.hstry.service.AnlsHstryService;
 import com.palnet.biz.api.bas.flight.model.BasFlightPlanAreaModel;
+import com.palnet.biz.api.bas.group.model.BasGroupUserListModel;
 import com.palnet.biz.api.bas.group.model.BasGroupUserModel;
 import com.palnet.biz.api.bas.group.model.BasGroupUserRqModel;
 import com.palnet.biz.api.bas.group.service.BasGroupUserService;
@@ -47,7 +48,7 @@ public class BasGroupUserController {
 	
 	
 	@GetMapping(value = "/list")
-	public ResponseEntity<? extends BasicResponse> list(BasGroupUserRqModel rq) {
+	public ResponseEntity<? extends BasicResponse> list(BasGroupUserListModel rq) {
 		List<BasGroupUserModel> result = null;
 		
 		if(StringUtils.isEmpty(rq.getCstmrSno())) {

src/main/java/com/palnet/biz/api/bas/group/model/BasGroupUserListModel.java

@@ -0,0 +1,13 @@
+package com.palnet.biz.api.bas.group.model;
+
+import lombok.Data;
+
+@Data
+public class BasGroupUserListModel{
+	
+	private String memberName;
+	
+	private String groupId;
+	
+	private int cstmrSno;
+}

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

@@ -17,6 +17,7 @@ import com.palnet.biz.api.bas.flight.model.BasFlightPlanAreaModel;
 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.api.bas.group.model.BasGroupUserListModel;
 import com.palnet.biz.api.bas.group.model.BasGroupUserModel;
 import com.palnet.biz.api.bas.group.model.BasGroupUserRqModel;
 import com.palnet.biz.jpa.entity.CtrCntrlBas;
@@ -53,7 +54,7 @@ public class BasGroupUserService {
 	 * @param rq
 	 * @return
 	 */
-	public List<BasGroupUserModel> list(BasGroupUserRqModel rq){
+	public List<BasGroupUserModel> list(BasGroupUserListModel rq){
 		
 		
 		List<BasGroupUserModel> resultList = query.userList(rq);

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

@@ -365,36 +365,35 @@ public class PtyGroupQueryRepository{
      * @param rq
      * @return
      */
-    public List<BasGroupUserModel> userList(BasGroupUserRqModel rq){
+    public List<BasGroupUserModel> userList(BasGroupUserListModel rq){
     	QPtyGroupBas bas = QPtyGroupBas.ptyGroupBas;
         QPtyCstmrGroup dtl = QPtyCstmrGroup.ptyCstmrGroup;
         QPtyCstmrBas cstmr = QPtyCstmrBas.ptyCstmrBas;
         QPtyCstmrDtl cstmrDtl = QPtyCstmrDtl.ptyCstmrDtl;
         
         BooleanBuilder builder = new BooleanBuilder();
-        String appAuth = jwtTokenUtil.getUserAuthByToken();
         
         builder.and(bas.useYn.eq("Y"));
         builder.and(dtl.joinYn.eq("Y"));
         builder.and(dtl.aprvlYn.eq("Y"));
-        
+        builder.and(bas.groupId.eq(rq.getGroupId()));
-        if(appAuth.equals("USER") || appAuth.equals("ROLE_USER")) {
+//        if(appAuth.equals("USER") || appAuth.equals("ROLE_USER")) {
-        builder.and(bas.groupId.in(
+//        builder.and(bas.groupId.in(
-                        		JPAExpressions
+//                        		JPAExpressions
-                        		.select(bas.groupId)
+//                        		.select(bas.groupId)
-                        		.from(bas)
+//                        		.from(bas)
-                        		.leftJoin(dtl)
+//                        		.leftJoin(dtl)
-                        		.on(bas.groupId.eq(dtl.groupId))
+//                        		.on(bas.groupId.eq(dtl.groupId))
-                        		.where(bas.useYn.eq("Y"))
+//                        		.where(bas.useYn.eq("Y"))
-                        		.where(dtl.cstmrSno.eq(rq.getCstmrSno()))
+//                        		.where(dtl.cstmrSno.eq(rq.getCstmrSno()))
-                        		.where(dtl.groupAuthCd.eq("MASTER").or(dtl.groupAuthCd.eq("LEADER")))
+//                        		.where(dtl.groupAuthCd.eq("MASTER").or(dtl.groupAuthCd.eq("LEADER")))
-                        				
+//                        				
-                        		));
+//                        		));
-        }
+//        }
-        if(!StringUtils.isEmpty(rq.getGroupNm())) {
+//        if(!StringUtils.isEmpty(rq.getGroupNm())) {
-        	builder.and(bas.groupNm.like("%" + rq.getGroupNm() + "%"));
+//        	builder.and(bas.groupNm.like("%" + rq.getGroupNm() + "%"));
-        }
+//        }
-       
+//       
 //        if(!StringUtils.isEmpty(rq.getMemberName())) {
 //        	String memberName = EncryptUtils.encrypt(rq.getMemberName());
 //        	builder.and(cstmrDtl.memberName.eq(memberName));