From 2aa2dca77f0affe56e18544ed443793aedaa9df1 Mon Sep 17 00:00:00 2001
From: "wei.peng" <123456>
Date: Sat, 6 Jul 2019 00:25:18 +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?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java  | 36 +++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

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 84eef50..c24d5f5 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
@@ -228,6 +228,21 @@ public class CoreHqlPack {
         return result.toString();
     }
 
+    public static DdlPackBean packDdlBeanSysMenu(SysMenu menu,List<Long> idList){
+        DdlPackBean result = DdlPackBean.getDdlPackBean();
+
+        DdlPreparedPack.getInPackList(idList,"id",result);
+        DdlPreparedPack.getNumEqualPack(menu.getParentId(),"parentId",result);
+        DdlPreparedPack.getNumEqualPack(menu.getMenuType(),"menuType",result);
+        DdlPreparedPack.getNumEqualPack(menu.getMenuStatus(),"menuStatus",result);
+        DdlPreparedPack.getStringLikerPack(menu.getName(),"name",result);
+        DdlPreparedPack.getStringLikerPack(menu.getMenuCode(),"menuCode",result);
+
+        result.setOrderByStr(menu.orderBy());
+
+        return result;
+    }
+
     /**
      * 系统角色复杂查询
      * @param role
@@ -474,7 +489,7 @@ public class CoreHqlPack {
         DdlPackBean result = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getNumEqualPack(user.getUserStatus(),"userStatus",result);
-        DdlPreparedPack.getStringLikerPack(user.getUserLoginName(),"",result);
+        DdlPreparedPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",result);
         DdlPreparedPack.getStringLikerPack(user.getUserName(),"userName",result);
         DdlPreparedPack.getStringLikerPack(user.getUserEmail(),"userEmail",result);
         DdlPreparedPack.getStringLikerPack(user.getUserPhone(),"userPhone",result);
@@ -592,6 +607,25 @@ public class CoreHqlPack {
         return  result.toString();
     }
 
+    public static DdlPackBean packDdlBeanSysUserInfo(SysUserInfo userInfo,List<Long> idList){
+        DdlPackBean result = DdlPackBean.getDdlPackBean();
+
+        // And
+        DdlPreparedPack.getNumEqualPack(userInfo.getPositionId(),"positionId",result);
+        DdlPreparedPack.getNumEqualPack(userInfo.getUserInfoStatus(),"userInfoStatus",result);
+        DdlPreparedPack.getStringEqualPack(userInfo.getOrganizeCode(),"organizeCode",result);
+        DdlPreparedPack.getInPackList(idList,"id",result);
+
+        // Like
+        DdlPreparedPack.getStringLikerPack(userInfo.getName(),"name",result);
+        DdlPreparedPack.getStringLikerPack(userInfo.getUserEmpNo(),"userEmpNo",result);
+
+        // 添加默认排序
+        result.setOrderByStr(userInfo.orderBy());
+
+        return  result;
+    }
+
     /**
      * 用户信息 复杂查询拼接
      * @param userInfo