update

src/main/java/com/zhiqiyun/open/mvc/controller/CategoryMaterialController.java

@@ -48,6 +48,7 @@ public class CategoryMaterialController {
             wrapper.like("name", param.getName());
         }
         Page<CategoryMaterial> page = param.getPage();
+        page.addOrder(OrderItem.asc("sort_number"));
         page.addOrder(OrderItem.desc("id"));
 
         Page<CategoryMaterial> resultData = this.categoryMaterialService.page(page, wrapper);

src/main/java/com/zhiqiyun/open/mvc/controller/CategoryOccupationController.java

@@ -48,6 +48,7 @@ public class CategoryOccupationController {
             wrapper.like("name", param.getName());
         }
         Page<CategoryOccupation> page = param.getPage();
+        page.addOrder(OrderItem.asc("sort_number"));
         page.addOrder(OrderItem.desc("id"));
 
         Page<CategoryOccupation> resultData = this.categoryOccupationService.page(page, wrapper);
@@ -64,6 +65,10 @@ public class CategoryOccupationController {
 
         OauthInfo oauthInfo = this.oauthService.getAuth(ServletContext.getAccessToken());
 
+        if (param.getSortNumber() == null) {
+            entity.setSortNumber(0);
+        }
+
         entity.setCreatedTime(DateUtil.current());
         entity.setCreatedBy(oauthInfo.getId());
 
@@ -83,6 +88,11 @@ public class CategoryOccupationController {
         BeanUtils.copyProperties(param, entity);
 
         OauthInfo oauthInfo = this.oauthService.getAuth(ServletContext.getAccessToken());
+
+        if (param.getSortNumber() == null) {
+            entity.setSortNumber(0);
+        }
+
         entity.setUpdatedBy(oauthInfo.getId());
         entity.setUpdatedTime(DateUtil.current());
         entity.setId(id);

src/main/resources/db/migration/V1.0.6__cultural_tourism.sql

@@ -38,7 +38,7 @@ CREATE TABLE `category_occupation`
     `id`           BIGINT(20) NOT NULL COMMENT 'ID',
     `name`         VARCHAR(50) NOT NULL COMMENT '岗位目录名称',
     `sort_number`  INT(11) NOT NULL COMMENT '排序ID',
-    `remark`       TEXT        NOT NULL COMMENT '备注说明',
+    `remark`       TEXT NULL DEFAULT NULL COMMENT '备注说明',
     `created_time` DATETIME NULL DEFAULT NULL COMMENT '创建时间',
     `created_by`   BIGINT(20) NULL DEFAULT NULL COMMENT '创建人',
     `updated_time` DATETIME NULL DEFAULT NULL COMMENT '修改时间',
@@ -61,7 +61,7 @@ CREATE TABLE `category_material`
     `id`           BIGINT(20) NOT NULL COMMENT 'ID',
     `name`         VARCHAR(50) NOT NULL COMMENT '物务资源目录名称',
     `sort_number`  INT(11) NOT NULL COMMENT '排序ID',
-    `remark`       TEXT        NOT NULL COMMENT '备注说明',
+    `remark`       TEXT NULL DEFAULT NULL COMMENT '备注说明',
     `created_time` DATETIME NULL DEFAULT NULL COMMENT '创建时间',
     `created_by`   BIGINT(20) NULL DEFAULT NULL COMMENT '创建人',
     `updated_time` DATETIME NULL DEFAULT NULL COMMENT '修改时间',