From 0aac978b99f5d24e5466c6dc344664bc294f883e Mon Sep 17 00:00:00 2001
From: "yunhao.wang" <yunhao.wang@estsh.com>
Date: Thu, 29 Nov 2018 21:59:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E5=85=B8=E7=AE=A1=E7=90=86=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/platform/bean/SysRefUserMessage.java     |  2 +-
 .../estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java  | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserMessage.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserMessage.java
index 0b0d0aa..1a8098c 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserMessage.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserMessage.java
@@ -27,7 +27,7 @@ import javax.persistence.Table;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Table(name="SYS_REF_USER_MESSAGE")
-@Api(value="关系-表达式与触发器",description = "关系-表达式与触发器")
+@Api(value="关系-用户消息",description = "关系-用户消息")
 public class SysRefUserMessage extends BaseBean {
 
     @Column(name="MESSAGE_ID")
diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
index 603a79a..621d45d 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
@@ -339,6 +339,22 @@ public class CoreHqlPack {
     }
 
     /**
+     * 查询字典值是否重复
+     * @param dictionary
+     * @return
+     */
+    public static String packHqlSysDictionaryValue(SysDictionary dictionary){
+        StringBuffer result = new StringBuffer();
+
+        // and
+        HqlPack.getStringEqualPack(dictionary.getDictionaryValue(),"dictionaryValue",result);
+        // not
+        HqlPack.getNumNOEqualPack(dictionary.getId(),"id",result);
+
+        return result.toString();
+    }
+
+    /**
      * 用户信息 复杂查询拼接
      * @param userInfo
      * @return