From bec70bc79d86450a6d3dad2f4eb09092cf212220 Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Tue, 16 Apr 2019 20:40:32 +0800 Subject: [PATCH 1/2] =?UTF-8?q?DdlPack=EF=BC=8C=E6=95=B0=E5=AD=97equals?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=A7=E4=BA=8E0=E7=9A=84=E7=BA=A6?= =?UTF-8?q?=E6=9D=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java index f74f02f..590ad9a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java @@ -255,7 +255,7 @@ public class DdlPreparedPack { * @param packBean */ public static void getNumEqualPack(Object data, String columnName, DdlPackBean packBean) { - if (data != null) { + if (data != null && Long.parseLong(data.toString()) > 0) { packBean.addColumnQuery(columnName," and model." + columnName + " = :m_" + columnName, data); } } From 2aa692a9c044c0b6e195f2085cdc94b95979638b Mon Sep 17 00:00:00 2001 From: "Rock.Yu" Date: Tue, 16 Apr 2019 20:40:44 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1.=20=E5=A2=9E=E5=8A=A0=E6=97=A0=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E7=9A=84=E6=9E=84=E9=80=A0=E5=87=BD=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/engine/rule/EngineRulePersistence.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/EngineRulePersistence.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/EngineRulePersistence.java index 41077b8..6f16869 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/EngineRulePersistence.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/EngineRulePersistence.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -23,6 +24,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @AllArgsConstructor +@NoArgsConstructor @EqualsAndHashCode(callSuper = true) @Table(name = "DROOLS_RULE_PERSISTENCE") @Api("系统动态业务规则")