prathabanKavin
/
device-mgt-core
forked from community/device-mgt-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check for logged in tenant id

Browse Source
mssqlgeofencedeletefix
prathabanKavin 2 years ago
parent bd5776947d
commit 1fb777264d
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File

7
components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/dao/impl/geofence/SQLServerGeofenceDAOImpl.java
Unescape View File

@ -26,6 +26,7 @@ import io.entgra.device.mgt.core.device.mgt.common.geo.service.GeofenceData;
import io.entgra.device.mgt.core.device.mgt.core.dao.DeviceManagementDAOException; import io.entgra.device.mgt.core.device.mgt.core.dao.DeviceManagementDAOException;
import io.entgra.device.mgt.core.device.mgt.core.dao.EventManagementDAOFactory; import io.entgra.device.mgt.core.device.mgt.core.dao.EventManagementDAOFactory;
import io.entgra.device.mgt.core.device.mgt.core.dao.impl.AbstractGeofenceDAOImpl; import io.entgra.device.mgt.core.device.mgt.core.dao.impl.AbstractGeofenceDAOImpl;
import org.wso2.carbon.context.CarbonContext;
import java.sql.Connection; import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
@ -114,7 +115,7 @@ public class SQLServerGeofenceDAOImpl extends AbstractGeofenceDAOImpl {
if (!requireGroupData) { if (!requireGroupData) {
return getGeofence(fenceId); return getGeofence(fenceId);
} }
int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId();
try { try {
Connection con = this.getConnection(); Connection con = this.getConnection();
String sql = "SELECT " + String sql = "SELECT " +
@ -131,9 +132,11 @@ public class SQLServerGeofenceDAOImpl extends AbstractGeofenceDAOImpl {
"FROM DM_GEOFENCE G, DM_GEOFENCE_GROUP_MAPPING M, DM_GROUP GR " + "FROM DM_GEOFENCE G, DM_GEOFENCE_GROUP_MAPPING M, DM_GROUP GR " +
"WHERE G.ID = M.FENCE_ID " + "WHERE G.ID = M.FENCE_ID " +
"AND M.GROUP_ID = GR.ID " + "AND M.GROUP_ID = GR.ID " +
"AND G.ID = ?"; "AND G.ID = ? " +
"AND G.TENANT_ID = ?";
try (PreparedStatement stmt = con.prepareStatement(sql, ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY)) { try (PreparedStatement stmt = con.prepareStatement(sql, ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY)) {
stmt.setInt(1, fenceId); stmt.setInt(1, fenceId);
stmt.setInt(2, tenantId);
try (ResultSet rst = stmt.executeQuery()) { try (ResultSet rst = stmt.executeQuery()) {
Map<Integer, String> groupMap = new HashMap<>(); Map<Integer, String> groupMap = new HashMap<>();
GeofenceData geofenceData = null; GeofenceData geofenceData = null;

Write Preview
Loading…
Cancel
Save