|
|
|
@ -1317,7 +1317,7 @@ public class GenericDeviceDAOImpl extends AbstractDeviceDAOImpl {
|
|
|
|
|
query += " AND i.VALUE_FIELD LIKE ?" ;
|
|
|
|
|
}
|
|
|
|
|
if (user != null && !user.isEmpty()) {
|
|
|
|
|
query += " AND e.OWNER = ?";
|
|
|
|
|
query += " AND e.OWNER LIKE ?";
|
|
|
|
|
isOwnerProvided = true;
|
|
|
|
|
}
|
|
|
|
|
if (status != null && !status.isEmpty()) {
|
|
|
|
@ -1347,7 +1347,7 @@ public class GenericDeviceDAOImpl extends AbstractDeviceDAOImpl {
|
|
|
|
|
ps.setString(index++, EnrolmentInfo.Status.REMOVED.toString());
|
|
|
|
|
ps.setString(index++, EnrolmentInfo.Status.DELETED.toString());
|
|
|
|
|
if (isDeviceNameProvided) {
|
|
|
|
|
ps.setString(index++, name + "%");
|
|
|
|
|
ps.setString(index++, "%" + name + "%");
|
|
|
|
|
}
|
|
|
|
|
if (isOwnershipProvided) {
|
|
|
|
|
ps.setString(index++, ownership);
|
|
|
|
@ -1356,7 +1356,7 @@ public class GenericDeviceDAOImpl extends AbstractDeviceDAOImpl {
|
|
|
|
|
ps.setString(index++, "%" + serial + "%");
|
|
|
|
|
}
|
|
|
|
|
if (isOwnerProvided) {
|
|
|
|
|
ps.setString(index++, user);
|
|
|
|
|
ps.setString(index++, "%" + user + "%");
|
|
|
|
|
}
|
|
|
|
|
if (isStatusProvided) {
|
|
|
|
|
for (String deviceStatus : status) {
|
|
|
|
|