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

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java

@@ -121,7 +121,7 @@ public class CoreHqlPack {
      * @return
      */
     public static DdlPackBean packHqlSysPositionList(SysPosition position){
-        DdlPackBean result = new DdlPackBean();
+        DdlPackBean result = DdlPackBean.getDdlPackBean(position);
 
         // 查询参数封装
         DdlPreparedPack.getStringEqualPack(position.getOrganizeCode(),"organizeCode",result);
@@ -153,7 +153,7 @@ public class CoreHqlPack {
     }
 
     public static DdlPackBean packHqlSysOrganize(SysOrganize organize,List<Long> idList){
-        DdlPackBean result = new DdlPackBean();
+        DdlPackBean result = DdlPackBean.getDdlPackBean(organize);
 
         // String Like
         DdlPreparedPack.getStringLikerPack(organize.getName(),"name",result);
@@ -197,7 +197,7 @@ public class CoreHqlPack {
     }
 
     public static DdlPackBean packDdlBeanSysDepartment(SysDepartment department,List<Long> idList){
-        DdlPackBean result = DdlPackBean.getDdlPackBean();
+        DdlPackBean result = DdlPackBean.getDdlPackBean(department);
 
         DdlPreparedPack.getStringLikerPack(department.getName(),"name",result);
         DdlPreparedPack.getStringLikerPack(department.getName(),"departmentCode",result);
@@ -229,7 +229,7 @@ public class CoreHqlPack {
     }
 
     public static DdlPackBean packDdlBeanSysMenu(SysMenu menu,List<Long> idList){
-        DdlPackBean result = DdlPackBean.getDdlPackBean();
+        DdlPackBean result = DdlPackBean.getDdlPackBean(menu);
 
         DdlPreparedPack.getInPackList(idList,"id",result);
         DdlPreparedPack.getNumEqualPack(menu.getParentId(),"parentId",result);
@@ -272,7 +272,7 @@ public class CoreHqlPack {
     }
 
     public static DdlPackBean packDdlBeanSysRole(SysRole role,List<Long> idList){
-        DdlPackBean result = new DdlPackBean();
+        DdlPackBean result = DdlPackBean.getDdlPackBean(role);
 
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result);
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isValid",result);
@@ -373,7 +373,7 @@ public class CoreHqlPack {
      * @return
      */
     public static DdlPackBean packHqlSysMessage(SysMessage message){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(message);
 
         // hql拼接
         DdlPreparedPack.getStringLikerPack(message.getMessageTitle(), "messageTitle", ddlPackBean);
@@ -486,7 +486,7 @@ public class CoreHqlPack {
     }
 
     public static DdlPackBean packDdlBeanSysUser(SysUser user,List<Long> idList){
-        DdlPackBean result = DdlPackBean.getDdlPackBean();
+        DdlPackBean result = DdlPackBean.getDdlPackBean(user);
 
         DdlPreparedPack.getNumEqualPack(user.getUserStatus(),"userStatus",result);
         DdlPreparedPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",result);
@@ -506,7 +506,7 @@ public class CoreHqlPack {
      * @return
      */
     public static DdlPackBean packDdlSysUser(SysUser user){
-        DdlPackBean ddlPack = new DdlPackBean();
+        DdlPackBean ddlPack = DdlPackBean.getDdlPackBean(user);
 
         // And X = X
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",ddlPack);
@@ -608,7 +608,7 @@ public class CoreHqlPack {
     }
 
     public static DdlPackBean packDdlBeanSysUserInfo(SysUserInfo userInfo,List<Long> idList){
-        DdlPackBean result = DdlPackBean.getDdlPackBean();
+        DdlPackBean result = DdlPackBean.getDdlPackBean(userInfo);
 
         // And
         DdlPreparedPack.getNumEqualPack(userInfo.getPositionId(),"positionId",result);
@@ -874,22 +874,20 @@ public class CoreHqlPack {
      * @return DdlPackBean
      */
     public static DdlPackBean packHqlSysFileCode(SysFile sysFile){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean result = DdlPackBean.getDdlPackBean(sysFile);
 
         // and
-        DdlPreparedPack.getStringEqualPack(sysFile.getFileCode(),"fileCode",ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(sysFile.getFileCode(),"fileCode",result);
         // not
-        DdlPreparedPack.getNumNOEqualPack(sysFile.getId(),"id",ddlPackBean);
+        DdlPreparedPack.getNumNOEqualPack(sysFile.getId(),"id",result);
 
-        return ddlPackBean;
+        return result;
     }
 
     public static DdlPackBean packDdlBeanSysRefUserRole(SysRefUserRole ref){
-        DdlPackBean result = new DdlPackBean();
+        DdlPackBean result = DdlPackBean.getDdlPackBean(ref);
 
         // Number Eq
-        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result);
-        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isValid",result);
         DdlPreparedPack.getNumEqualPack(ref.getUserId(),"userId",result);
         // String Eq
         DdlPreparedPack.getStringEqualPack(ref.getOrganizeCode(),"organizeCode",result);
@@ -901,8 +899,6 @@ public class CoreHqlPack {
         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);
 
@@ -918,10 +914,8 @@ public class CoreHqlPack {
      * @return
      */
     public static DdlPackBean packHqlSysOrganize(List<SysRefUserDepartment> sysRefUserDepartments){
-        DdlPackBean packBean = new DdlPackBean();
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean();
         DdlPreparedPack.getInPackList(sysRefUserDepartments.stream().map(d -> d.getOrganizeId()).collect(Collectors.toList()),"id",packBean);
-        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",packBean);
-        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",packBean);
 
         return packBean;
     }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapCyco.java

@@ -58,7 +58,7 @@ public class SapCyco extends SapBase{
 
     @ApiParam(value = "删除标识")
     @AnnoOutputColumn
-    private String xloek;
+    private String xloek="";
 
     @ApiParam(value = "年度")
     @AnnoOutputColumn