bug解决

添加默认字典项
ics添加全局异常捕获

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java

@@ -43,7 +43,6 @@ public class PagerHelper {
     }
 
     private static Pager getPager(int pageSize, int currentPage, int totalRows) {
-        // TODO 10可用系统参数替换
         pageSize = pageSize == 0 ? 10 : pageSize;
 
         Pager pager = new Pager();

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java

@@ -33,7 +33,7 @@ public class SysDictionary extends BaseBean {
     @Column(name="NAME")
     @ApiParam(value ="字典名称")
     private String name;
- 
+
     @Column(name="DICTIONARY_CODE")
     @ApiParam(value ="字典代码")
     private String dictionaryCode;
@@ -55,11 +55,15 @@ public class SysDictionary extends BaseBean {
     @Column(name="DICTIONARY_VALUE")
     @ApiParam(value ="字典值")
     private String dictionaryValue;
- 
+
     @Column(name="DICTIONARY_SORT")
     @ApiParam(value ="排序" , example ="1")
     private Integer dictionarySort;
- 
+
+    @Column(name="IS_DEFAULT")
+    @ApiParam(value = "是否默认",example = "2")
+    private Integer isDefault;
+
     @Column(name="DICTIONARY_DESCRIPTION")
     @ApiParam(value ="描述")
     private String dictionaryDescription;

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

@@ -263,6 +263,7 @@ public class CoreHqlPack {
         HqlPack.getStringLikerPack(message.getMessageSenderNameRdd(),"messageSenderNameRdd",result);
         HqlPack.getStringLikerPack(message.getMessageReceiversNameRdd(),"messageReceiversNameRdd",result);
         HqlPack.timeBuilder(message.getMessageSendTime(),"messageSendTime", result, false,false);
+        HqlPack.getNumEqualPack(message.getMessageSenderId(),"messageSenderId",result);
 
         return  result.toString();
     }
@@ -276,7 +277,7 @@ public class CoreHqlPack {
         StringBuffer result = new StringBuffer();
 
         // hql拼接
-        HqlPack.getStringLikerPack(file.getName(),"name",result);
+        HqlPack.getStringLikerPack(file.getFileOriginalName(),"fileOriginalName",result);
         HqlPack.getNumEqualPack(file.getFileTypeId(),"fileTypeId",result);
         HqlPack.getStringLikerPack(file.getCreateUser(),"createUser",result);
         HqlPack.timeBuilder(file.getCreateDatetime(),"createDatetime",result,false,false);
@@ -362,6 +363,7 @@ public class CoreHqlPack {
 
         // and
         HqlPack.getStringEqualPack(dictionary.getDictionaryValue(),"dictionaryValue",result);
+        HqlPack.getNumEqualPack(dictionary.getParentId(),"parentId",result);
         // not
         HqlPack.getNumNOEqualPack(dictionary.getId(),"id",result);
 
@@ -478,11 +480,11 @@ public class CoreHqlPack {
         StringBuffer result =  new StringBuffer();
 
         HqlPack.getNumEqualPack(sysRefUserMessage.getMessageTypeRdd(),"messageTypeRdd",result);
-        HqlPack.getNumEqualPack(sysRefUserMessage.getReceiverId(),"receiverId",result);
         HqlPack.getStringLikerPack(sysRefUserMessage.getMessageTitleRdd(),"messageTitleRdd",result);
         HqlPack.getStringLikerPack(sysRefUserMessage.getMessageSenderNameRdd(),"messageSenderNameRdd",result);
         HqlPack.getNumEqualPack(sysRefUserMessage.getMessageStatus(),"messageStatus",result);
         HqlPack.getStringLikerPack(sysRefUserMessage.getReceiverTime(),"receiverTime",result);
+        HqlPack.getNumEqualPack(sysRefUserMessage.getReceiverId(),"receiverId",result);
 
         return result.toString();
     }