|
|
@ -659,7 +659,7 @@ public abstract class AbstractGroupDAOImpl implements GroupDAO {
|
|
|
|
List<DeviceGroup> deviceGroupBuilders = new ArrayList<>();
|
|
|
|
List<DeviceGroup> deviceGroupBuilders = new ArrayList<>();
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
Connection conn = GroupManagementDAOFactory.getConnection();
|
|
|
|
Connection conn = GroupManagementDAOFactory.getConnection();
|
|
|
|
String sql = "SELECT G.ID, G.GROUP_NAME, G.DESCRIPTION, G.OWNER, G.STATUS, G.PARENT_PATH FROM DM_GROUP G " +
|
|
|
|
String sql = "SELECT G.ID, G.GROUP_NAME, G.DESCRIPTION, G.OWNER, G.STATUS, G.PARENT_PATH, G.PARENT_GROUP_ID FROM DM_GROUP G " +
|
|
|
|
"INNER JOIN DM_DEVICE_GROUP_MAP GM ON G.ID = GM.GROUP_ID " +
|
|
|
|
"INNER JOIN DM_DEVICE_GROUP_MAP GM ON G.ID = GM.GROUP_ID " +
|
|
|
|
"WHERE GM.DEVICE_ID = ? AND GM.TENANT_ID = ?";
|
|
|
|
"WHERE GM.DEVICE_ID = ? AND GM.TENANT_ID = ?";
|
|
|
|
stmt = conn.prepareStatement(sql);
|
|
|
|
stmt = conn.prepareStatement(sql);
|
|
|
|