fix org

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/organization/vo/OrganizationListReqVO.java

@@ -38,13 +38,13 @@ public class OrganizationListReqVO {
     private Boolean isEnable;
 
     @Schema(description = "组织状态", example = "1")
-    private Integer status;
+    private String status;
 
     @Schema(description = "组织等级")
-    private Integer orgClass;
+    private String orgClass;
 
     @Schema(description = "组织类型", example = "2")
-    private Integer orgType;
+    private String orgType;
 
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/organization/vo/OrganizationRespVO.java

@@ -55,17 +55,17 @@ public class OrganizationRespVO {
     @Schema(description = "组织状态", example = "1")
     @ExcelProperty(value = "组织状态", converter = DictConvert.class)
     @DictFormat("mes_org_status") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中
-    private Integer status;
+    private String status;
 
     @Schema(description = "组织等级")
     @ExcelProperty(value = "组织等级", converter = DictConvert.class)
     @DictFormat("mes_org_class") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中
-    private Integer orgClass;
+    private String orgClass;
 
-    @Schema(description = "组织类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @Schema(description = "组织类型")
     @ExcelProperty(value = "组织类型", converter = DictConvert.class)
     @DictFormat("mes_org_type") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中
-    private Integer orgType;
+    private String orgType;
 
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/organization/vo/OrganizationSaveReqVO.java

@@ -42,13 +42,12 @@ public class OrganizationSaveReqVO {
     private Boolean isEnable;
 
     @Schema(description = "组织状态", example = "1")
-    private Integer status;
+    private String status;
 
     @Schema(description = "组织等级")
-    private Integer orgClass;
+    private String orgClass;
 
-    @Schema(description = "组织类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @Schema(description = "组织类型")
-    @NotNull(message = "组织类型不能为空")
+    private String orgType;
-    private Integer orgType;
 
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/organization/OrganizationDO.java

@@ -68,18 +68,18 @@ public class OrganizationDO extends BaseDO {
      *
      * 枚举 {@link TODO mes_org_status 对应的类}
      */
-    private Integer status;
+    private String status;
     /**
      * 组织等级
      *
      * 枚举 {@link TODO mes_org_class 对应的类}
      */
-    private Integer orgClass;
+    private String orgClass;
     /**
      * 组织类型
      *
      * 枚举 {@link TODO mes_org_type 对应的类}
      */
-    private Integer orgType;
+    private String orgType;
 
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/organization/OrganizationMapper.java

@@ -31,7 +31,7 @@ public interface OrganizationMapper extends BaseMapperX<OrganizationDO> {
                 .eqIfPresent(OrganizationDO::getOrgClass, reqVO.getOrgClass())
                 .eqIfPresent(OrganizationDO::getOrgType, reqVO.getOrgType())
                 .betweenIfPresent(OrganizationDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(OrganizationDO::getId));
+                .orderByAsc(OrganizationDO::getSort));
     }
 
 	default OrganizationDO selectByParentIdAndName(Long parentId, String name) {

yudao-module-mes/yudao-module-mes-biz/src/test/resources/sql/create_tables.sql

@@ -47,9 +47,9 @@ CREATE TABLE IF NOT EXISTS "mes_organization"
     "phone"          varchar,
     "email"          varchar,
     "is_enable"      bit      NOT NULL,
-    "status"         int,
+    "status"         varchar,
-    "org_class"      int,
+    "org_class"      varchar,
-    "org_type"       int      NOT NULL,
+    "org_type"       varchar,
     "creator"        varchar           DEFAULT '',
     "create_time"    datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
     "updater"        varchar           DEFAULT '',