diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BoneQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BoneQuery.java
index 8cb42d4..b76b1de 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/BoneQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/BoneQuery.java
@@ -83,29 +83,32 @@ public class BoneQuery extends BaseQuery implements IConvertToNativeQuery {
if (null != lastMensesStart && lastMensesEnd != null) {
if (null != c) {
- c = c.where("lastMenses").gte(lastMensesStart).lte(lastMensesEnd);
+ c = c.and("lastMenses").gte(lastMensesStart).lte(lastMensesEnd);
} else {
c = Criteria.where("lastMenses").gte(lastMensesStart).lte(lastMensesEnd);
}
}
if (null != createdTimeStart && createdTimeEnd != null) {
+
if (null != c) {
- c = c.where("created").gte(createdTimeStart).lte(createdTimeEnd);
+ c = c.and("created").gte(createdTimeStart).lte(createdTimeEnd);
} else {
c = Criteria.where("created").gte(createdTimeStart).lte(createdTimeEnd);
}
}
if (null != birthStart && birthEnd != null) {
+
if (null != c) {
- c = c.where("birthday").gte(birthStart).lte(birthEnd);
+ c = c.and("birthday").gte(birthStart).lte(birthEnd);
} else {
c = Criteria.where("birthday").gte(birthStart).lte(birthEnd);
}
}
if (null != modifiedStart && modifiedEnd != null) {
+
if (null != c) {
- c = c.where("modified").gte(modifiedStart).lte(modifiedEnd);
+ c = c.and("modified").gte(modifiedStart).lte(modifiedEnd);
} else {
c = Criteria.where("modified").gte(modifiedStart).lte(modifiedEnd);
}
diff --git a/platform-dal/src/main/java/com/lyms/platform/query/MicroelementQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/MicroelementQuery.java
index 579f078..9770065 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/MicroelementQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/MicroelementQuery.java
@@ -77,7 +77,7 @@ public class MicroelementQuery extends BaseQuery implements IConvertToNativeQuer
if (null != lastMensesStart && lastMensesEnd != null) {
if (null != c) {
- c = c.where("lastMenses").gte(lastMensesStart).lte(lastMensesEnd);
+ c = c.and("lastMenses").gte(lastMensesStart).lte(lastMensesEnd);
} else {
c = Criteria.where("lastMenses").gte(lastMensesStart).lte(lastMensesEnd);
}
@@ -85,21 +85,22 @@ public class MicroelementQuery extends BaseQuery implements IConvertToNativeQuer
if (null != birthStart && birthEnd != null) {
if (null != c) {
- c = c.where("birthday").gte(birthStart).lte(birthEnd);
+ c = c.and("birthday").gte(birthStart).lte(birthEnd);
} else {
c = Criteria.where("birthday").gte(birthStart).lte(birthEnd);
}
}
if (null != createdTimeStart && createdTimeEnd != null) {
if (null != c) {
- c = c.where("created").gte(createdTimeStart).lte(createdTimeEnd);
+ c = c.and("created").gte(createdTimeStart).lte(createdTimeEnd);
} else {
c = Criteria.where("created").gte(createdTimeStart).lte(createdTimeEnd);
}
}
if (null != modifiedStart && modifiedEnd != null) {
+
if (null != c) {
- c = c.where("modified").gte(modifiedStart).lte(modifiedEnd);
+ c = c.and("modified").gte(modifiedStart).lte(modifiedEnd);
} else {
c = Criteria.where("modified").gte(modifiedStart).lte(modifiedEnd);
}
diff --git a/platform-operate-api/src/main/resources/spring/applicationContext-dal.xml b/platform-operate-api/src/main/resources/spring/applicationContext-dal.xml
index 33bb7af..7e221e9 100644
--- a/platform-operate-api/src/main/resources/spring/applicationContext-dal.xml
+++ b/platform-operate-api/src/main/resources/spring/applicationContext-dal.xml
@@ -14,12 +14,12 @@
-
+
-
-
+
+
-
+