Merge remote-tracking branch 'origin/master'

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;

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);