Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf

src/com/engine/organization/annotation/OrganizationTable.java

@@ -55,6 +55,13 @@ public @interface OrganizationTable {
      */
     boolean distinct() default false;
 
+
+    /**
+     * 排序方式
+     * @return
+     */
+    String sortway() default "desc";
+
     /**
      * 操作按钮
      */

src/com/engine/organization/component/OrganizationWeaTable.java

@@ -38,6 +38,10 @@ public class OrganizationWeaTable<T> extends WeaTable {
             if (StringUtils.isNotBlank(orderby)) {
                 super.setSqlorderby(orderby);
             }
+            String sortway = table.sortway();
+            if (StringUtils.isNotBlank(sortway)) {
+                super.setSqlsortway(sortway);
+            }
             String groupby = table.groupby();
             if (StringUtils.isNotBlank(groupby)) {
                 super.setSqlgroupby(groupby);

src/com/engine/organization/entity/scheme/vo/SchemeTableVO.java

@@ -24,7 +24,8 @@ import lombok.NoArgsConstructor;
                 "t.create_time," +
                 "t.update_time",
         fromSql = "FROM jcl_org_scheme t ",
-        orderby = "id desc",
+        orderby = "scheme_no",
+        sortway = "asc",
         primarykey = "id",
         operates = {
                 @OrganizationTableOperate(index = "0", text = "编辑"),
@@ -49,7 +50,7 @@ public class SchemeTableVO {
     /**
      * 方案编号
      */
-    @OrganizationTableColumn(text = "编号", width = "25%", column = "scheme_no")
+    @OrganizationTableColumn(text = "编号", width = "25%", column = "scheme_no", orderkey = "scheme_no")
     private String schemeNo;
     /**
      * 方案名称