diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java index 7800319..ad9091d 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java @@ -931,11 +931,23 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { } } - if (null != babyWeightStart) { - c = Criteria.where("babyWeight").gte(babyWeightStart); + if (null != c) { + c = c.and("babyWeight").gte(babyWeightStart); + } else { + c = Criteria.where("babyWeight").gte(babyWeightStart); + } + } + + if (null != babyWeightEnd) { + if (null != c) { + c = c.lte(babyWeightEnd); + } else { + c = Criteria.where("babyWeight").lte(babyWeightEnd); + } } + if (null != buildDateStart) { if (null != c) { c = c.and("buildDate").gte(buildDateStart);