From be78ed2636eb7cb8e589d8b304008ff4cd74144d Mon Sep 17 00:00:00 2001
From: "wei.peng" <123456>
Date: Fri, 5 Jul 2019 22:01:42 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9D=83=E9=99=90=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E3=80=80=E5=B8=90=E5=8F=B7=E7=AE=A1=E7=90=86=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../estsh/i3plus/pojo/platform/bean/SysUser.java   |  2 +-
 .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java  | 30 ++++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java
index aa214c0..af22709 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java
@@ -144,7 +144,7 @@ public class SysUser extends BaseBean {
     @Transient
     @ApiParam(value ="角色ID" , example = "0")
     @JsonSerialize(using = ToStringSerializer.class)
-    private String roleId;
+    private Long roleId;
 
     @Transient
     @ApiParam(value ="角色ID集合" , example = "0")
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 43e4101..84eef50 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
@@ -470,6 +470,21 @@ public class CoreHqlPack {
         return  result.toString();
     }
 
+    public static DdlPackBean packDdlBeanSysUser(SysUser user,List<Long> idList){
+        DdlPackBean result = DdlPackBean.getDdlPackBean();
+
+        DdlPreparedPack.getNumEqualPack(user.getUserStatus(),"userStatus",result);
+        DdlPreparedPack.getStringLikerPack(user.getUserLoginName(),"",result);
+        DdlPreparedPack.getStringLikerPack(user.getUserName(),"userName",result);
+        DdlPreparedPack.getStringLikerPack(user.getUserEmail(),"userEmail",result);
+        DdlPreparedPack.getStringLikerPack(user.getUserPhone(),"userPhone",result);
+
+        DdlPreparedPack.getInPackList(idList,"id",result);
+        result.setOrderByStr(user.orderBy());
+
+        return result;
+    }
+
     /**
      * 账号复杂查询
      * @param user
@@ -848,6 +863,21 @@ public class CoreHqlPack {
         return result;
     }
 
+    public static DdlPackBean packDdlBeanSysRefUserRole(Long userId,Long roleId,String organizeCode){
+        DdlPackBean result = DdlPackBean.getDdlPackBean();
+
+        // Number Eq
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",result);
+        DdlPreparedPack.getNumEqualPack(userId,"userId",result);
+        DdlPreparedPack.getNumEqualPack(roleId,"roleId",result);
+
+        // String Eq
+        DdlPreparedPack.getStringEqualPack(organizeCode,"organizeCode",result);
+
+        return result;
+    }
+
     /**
      * 查询当前用户所有组织数据
      * @param sysRefUserDepartments