From b77fc7f291f9f34230009a776346d90e9f32bcc2 Mon Sep 17 00:00:00 2001
From: "frin.fei" <123456>
Date: Tue, 13 Nov 2018 20:35:40 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=BE=AE=E6=9C=8D=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
index 0bd8dae..eabf7ff 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
@@ -16,7 +16,8 @@ public class CommonEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum SOFT_TYPE {
-        IMPP(1, "IMPP", "IMPP平台"), CORE(2, "CORE", "i3业务平台"), WMS(3, "WMS", "仓库管理软件"), MES(4, "MES", "生产管理软件");
+        IMPP(1, "IMPP", "IMPP平台"), CORE(2, "CORE", "i3业务平台"), WMS(3, "WMS", "仓库管理软件"), MES(4, "MES", "生产管理软件"),
+        CENTER(99,"CENTER","注册服务中心");
 
         private int value;
         private String code;

From 30683429a9c39c2f789f16a735acc6743641b9bd Mon Sep 17 00:00:00 2001
From: "wei.peng" <pengwei940613@163.com>
Date: Tue, 13 Nov 2018 22:31:18 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B4=A6=E5=8F=B7?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 1 +
 1 file changed, 1 insertion(+)

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 0c70f65..7b51eb8 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
@@ -296,6 +296,7 @@ public class CoreHqlPack {
         // And X = X
         HqlPack.getNumEqualPack(user.getIsValid(),"isValid",result);
         HqlPack.getNumEqualPack(user.getDepartmentId(),"departmentId",result);
+        HqlPack.getNumEqualPack(user.getRoleId(),"roleId",result);
         // And Like % %
         HqlPack.getStringLikerPack(user.getUserName(),"userName",result);
         HqlPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",result);