From c168f4bff9eff3a85ed8fe14f93ced3cd56c8351 Mon Sep 17 00:00:00 2001
From: dxfeng <dongxuefengdd@163.com>
Date: Thu, 12 May 2022 10:13:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=8C=E7=AD=89=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/engine/organization/entity/scheme/dto/GradeDTO.java   | 4 ++--
 .../organization/entity/scheme/param/GradeSearchParam.java    | 2 +-
 src/com/engine/organization/entity/scheme/po/GradePO.java     | 2 +-
 .../engine/organization/entity/scheme/vo/GradeTableVO.java    | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/com/engine/organization/entity/scheme/dto/GradeDTO.java b/src/com/engine/organization/entity/scheme/dto/GradeDTO.java
index 88286451..f6f0699d 100644
--- a/src/com/engine/organization/entity/scheme/dto/GradeDTO.java
+++ b/src/com/engine/organization/entity/scheme/dto/GradeDTO.java
@@ -43,7 +43,7 @@ public class GradeDTO {
     /**
      * 职等
      */
-    private long levelId;
+    private String levelId;
     /**
      * 禁用标记
      */
@@ -76,7 +76,7 @@ public class GradeDTO {
                 .gradeName(param.getGradeName() == null ? null : param.getGradeName())
                 .description(param.getDescription() == null ? null : param.getDescription())
                 .schemeId(param.getSchemeId() == null ? 0 : param.getSchemeId())
-                .levelId(param.getLevelId() == null ? 0 : param.getLevelId())
+                .levelId(param.getLevelId() == null ? null : param.getLevelId())
                 .forbiddenTag(param.getForbiddenTag() == null ? 0 : param.getForbiddenTag() ? 0 : 1)
                 .deleteType(0)
                 .createTime(new Date())
diff --git a/src/com/engine/organization/entity/scheme/param/GradeSearchParam.java b/src/com/engine/organization/entity/scheme/param/GradeSearchParam.java
index 85308c99..81ed4b4c 100644
--- a/src/com/engine/organization/entity/scheme/param/GradeSearchParam.java
+++ b/src/com/engine/organization/entity/scheme/param/GradeSearchParam.java
@@ -40,7 +40,7 @@ public class GradeSearchParam {
     /**
      * 职等
      */
-    private Long levelId;
+    private String levelId;
     /**
      * 禁用标记
      */
diff --git a/src/com/engine/organization/entity/scheme/po/GradePO.java b/src/com/engine/organization/entity/scheme/po/GradePO.java
index 056c5911..3a303f2d 100644
--- a/src/com/engine/organization/entity/scheme/po/GradePO.java
+++ b/src/com/engine/organization/entity/scheme/po/GradePO.java
@@ -41,7 +41,7 @@ public class GradePO {
     /**
      * 职等
      */
-    private long levelId;
+    private String levelId;
     /**
      * 禁用标记
      */
diff --git a/src/com/engine/organization/entity/scheme/vo/GradeTableVO.java b/src/com/engine/organization/entity/scheme/vo/GradeTableVO.java
index 56fa2a4f..71808efe 100644
--- a/src/com/engine/organization/entity/scheme/vo/GradeTableVO.java
+++ b/src/com/engine/organization/entity/scheme/vo/GradeTableVO.java
@@ -67,11 +67,11 @@ public class GradeTableVO {
     /**
      * 职等
      */
-    private long levelId;
+    private String levelId;
     /**
      * 职等
      */
-    @OrganizationTableColumn(text = "等级方案", width = "20%", column = "level_name")
+    @OrganizationTableColumn(text = "职等", width = "20%", column = "level_name")
     private String levelName;
     /**
      * 禁用标记