Mercurial > dive4elements > river
comparison backend/src/main/java/org/dive4elements/river/model/BedHeight.java @ 9089:02e4a0d983c0
Fixed :bed heights finder did not consider the river correctly
| author | gernotbelger |
|---|---|
| date | Fri, 25 May 2018 10:49:42 +0200 |
| parents | 766890addcb2 |
| children | 32dd7e761e4e |
comparison
equal
deleted
inserted
replaced
| 9088:7e60457f9d26 | 9089:02e4a0d983c0 |
|---|---|
| 241 final List<BedHeight> singles = query.list(); | 241 final List<BedHeight> singles = query.list(); |
| 242 | 242 |
| 243 return singles != null ? singles.get(0) : null; | 243 return singles != null ? singles.get(0) : null; |
| 244 } | 244 } |
| 245 | 245 |
| 246 public static BedHeight getBedHeightByDescription(final String description) { | 246 public static BedHeight getBedHeightByDescription(final River river, final String description) { |
| 247 | 247 |
| 248 final Session session = SessionHolder.HOLDER.get(); | 248 final Session session = SessionHolder.HOLDER.get(); |
| 249 | 249 |
| 250 final Query query = session.createQuery("FROM BedHeight WHERE (trim(description)=:description)"); | 250 final Query query = session.createQuery("FROM BedHeight WHERE (trim(description)=:description) AND river=:river"); |
| 251 query.setParameter("river", river); | |
| 251 query.setParameter("description", description); | 252 query.setParameter("description", description); |
| 252 | 253 |
| 253 final List<BedHeight> singles = query.list(); | 254 final List<BedHeight> singles = query.list(); |
| 254 | 255 |
| 255 return singles != null ? singles.get(0) : null; | 256 return singles != null ? singles.get(0) : null; |