From 9981c4089b5f918e88032238ee08851d97412e26 Mon Sep 17 00:00:00 2001
From: crish <570360737@qq.com>
Date: Fri, 30 Aug 2019 14:40:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=94=AF=E4=B8=80=E6=80=A7?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=EF=BC=8C=20=E4=B8=8D=E8=83=BD=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E7=A6=81=E7=94=A8=E7=9A=84=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: crish <570360737@qq.com>
---
 .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java  | 26 ++++++++++------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
index cbbb025..6796c95 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
@@ -507,14 +507,17 @@ public class MesHqlPack {
     }
 
     public static DdlPackBean getMesEventByEventCode(String eventCode, String org) {
-        DdlPackBean packBean = getAllBaseData(org);
+        DdlPackBean packBean = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(org, "organizeCode", packBean);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean);
         DdlPreparedPack.getStringEqualPack(eventCode, "eventCode", packBean);
-        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
         return packBean;
     }
 
     public static DdlPackBean getMesActionByActionCode(MesAction mesAction, String organizeCode) {
-        DdlPackBean packBean = getAllBaseDataByNormalPro(mesAction, organizeCode);
+        DdlPackBean packBean = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean);
         DdlPreparedPack.getStringEqualPack(mesAction.getActionCode(), "actionCode", packBean);
         return packBean;
     }
@@ -567,10 +570,10 @@ public class MesHqlPack {
     }
 
     public static DdlPackBean getMesMethodByMethodCode(MesMethod mesMethod, String organizeCode) {
-        DdlPackBean packBean = getAllBaseDataByNormalPro(mesMethod, organizeCode);
-        if (StringUtils.isNotEmpty(mesMethod.getMethodCode())) {
-            DdlPreparedPack.getStringEqualPack(mesMethod.getMethodCode(), "methodCode", packBean);
-        }
+        DdlPackBean packBean = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean);
+        DdlPreparedPack.getStringEqualPack(mesMethod.getMethodCode(), "methodCode", packBean);
         return packBean;
     }
 
@@ -1143,13 +1146,8 @@ public class MesHqlPack {
      */
     public static DdlPackBean getMesPcnTask(MesPcnTask mesPcnTask, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(mesPcnTask, organizeCode);
-        if (StringUtils.isNotEmpty(mesPcnTask.getTaskCode())) {
-            DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskCode(), "taskCode", packBean);
-        }
-        if (StringUtils.isNotEmpty(mesPcnTask.getTaskName())) {
-            DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskName(), "taskName", packBean);
-        }
-
+        DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskCode(), "taskCode", packBean);
+        DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskName(), "taskName", packBean);
         packBean.setOrderByStr(mesPcnTask.orderBy());
         return packBean;
     }