Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

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