修改唯一性校验， 不能新增禁用的信息

Signed-off-by: crish <570360737@qq.com>

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);
+        DdlPackBean packBean = new DdlPackBean();
-        if (StringUtils.isNotEmpty(mesMethod.getMethodCode())) {
+        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);
-        }
-
         packBean.setOrderByStr(mesPcnTask.orderBy());
         return packBean;
     }