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

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java

@@ -108,4 +108,8 @@ public abstract class BaseBean implements Serializable {
         }
         return result;
     }
+
+    public String getOrderByParam() {
+        return this.orderByParam == null ? "" : this.orderByParam;
+    }
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java

@@ -80,7 +80,7 @@ public interface BaseRepository <T, ID extends Serializable> extends JpaReposito
      * 通过 in 批量删除
      * @param ids 熟悉值数组
      */
-    public void deleteByIds(long[] ids);
+    public void deleteByIds(Long[] ids);
 
     /**
      * 通过多单属性进行单个值更新

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java

@@ -144,7 +144,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
     }
 
     @Override
-    public void deleteByIds(long[] ids) {
+    public void deleteByIds(Long[] ids) {
         if(ids != null && ids.length > 0){
             String hql = "delete from " + persistentClass.getName() + " model where model.id in(:ids) ";
             Query query = entityManager.createQuery(hql);

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

@@ -64,4 +64,13 @@ public class RefRoleMenu extends BaseBean {
     @ApiParam(value ="角色名称" , access ="角色名称")
     private String redRoleName;
 
+    public RefRoleMenu() {
+    }
+
+    public RefRoleMenu(Long menuId, String redMenuName, Long roleId, String redRoleName) {
+        this.menuId = menuId;
+        this.redMenuName = redMenuName;
+        this.roleId = roleId;
+        this.redRoleName = redRoleName;
+    }
 }