|
|
|
@ -184,15 +184,15 @@ public class CtrCntrlService {
|
|
|
|
|
* @param cstmrSno |
|
|
|
|
* @return |
|
|
|
|
*/ |
|
|
|
|
public List<CtrCntrlGroupModel> getGroupAuthInfo() { |
|
|
|
|
public List<CtrCntrlGroupArcrftModel> getGroupAuthInfo() { |
|
|
|
|
|
|
|
|
|
List<CtrCntrlGroupModel> list = query.findByGroupInfo(); |
|
|
|
|
|
|
|
|
|
List<CtrCntrlGroupArcrftModel> arcrftList= new ArrayList<>(); |
|
|
|
|
for(CtrCntrlGroupModel lists : list) { |
|
|
|
|
List<CtrCntrlGroupArcrftModel> arcrftList = query.findByGroupArcrft(lists.getGroupId()); |
|
|
|
|
lists.setArcrftList(arcrftList); |
|
|
|
|
List<CtrCntrlGroupArcrftModel> groupArcrft = query.findByGroupArcrft(lists.getGroupId()); |
|
|
|
|
arcrftList.addAll(groupArcrft); |
|
|
|
|
} |
|
|
|
|
return list; |
|
|
|
|
return arcrftList; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|