From 92977e81c3a3a398e9cdb408ee4913d6fdeb0cca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Thu, 14 Jul 2022 15:56:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=8E=86=E5=8F=B2=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E6=8E=92=E5=BA=8F=E6=9D=83=E9=87=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/engine/salary/mapper/sys/SalarySysConfMapper.java   | 2 ++
 src/com/engine/salary/mapper/sys/SalarySysConfMapper.xml    | 6 ++++++
 src/com/engine/salary/sys/service/impl/InitServiceImpl.java | 4 +++-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/com/engine/salary/mapper/sys/SalarySysConfMapper.java b/src/com/engine/salary/mapper/sys/SalarySysConfMapper.java
index 947e422f5..2b3596f74 100644
--- a/src/com/engine/salary/mapper/sys/SalarySysConfMapper.java
+++ b/src/com/engine/salary/mapper/sys/SalarySysConfMapper.java
@@ -62,4 +62,6 @@ public interface SalarySysConfMapper {
 	int delete(SalarySysConfPO salarySysConf);
 
 	SalarySysConfPO getOneByCode(String confKey);
+
+	int countByCode(String confKey);
 }
\ No newline at end of file
diff --git a/src/com/engine/salary/mapper/sys/SalarySysConfMapper.xml b/src/com/engine/salary/mapper/sys/SalarySysConfMapper.xml
index b04d848a0..e2f6a19be 100644
--- a/src/com/engine/salary/mapper/sys/SalarySysConfMapper.xml
+++ b/src/com/engine/salary/mapper/sys/SalarySysConfMapper.xml
@@ -227,5 +227,11 @@
         AND conf_key = #{confKey}
     </select>
 
+    <select id="countByCode" resultType="java.lang.Integer">
+        SELECT count(0)
+        FROM hrsa_salary_sys_conf t
+        WHERE delete_type = 0
+          AND conf_key = #{confKey}
+    </select>
 
 </mapper>
\ No newline at end of file
diff --git a/src/com/engine/salary/sys/service/impl/InitServiceImpl.java b/src/com/engine/salary/sys/service/impl/InitServiceImpl.java
index 7dd6ca0a6..bf7d8ee30 100644
--- a/src/com/engine/salary/sys/service/impl/InitServiceImpl.java
+++ b/src/com/engine/salary/sys/service/impl/InitServiceImpl.java
@@ -30,7 +30,7 @@ public class InitServiceImpl {
         //当前版本
         SalarySysConfPO currentVersion = getSalarySysConfMapper().getOneByCode("currentVersion");
         //前一个版本
-        SalarySysConfPO previousVersion = getSalarySysConfMapper().getOneByCode("previousVersion");
+        int orderWeight = getSalarySysConfMapper().countByCode("previousVersion");
         if (currentVersion == null) {
             //初始化版本
             SalarySysConfPO current = SalarySysConfPO.builder()
@@ -39,6 +39,7 @@ public class InitServiceImpl {
                     .confValue(version)
                     .title("当前版本")
                     .module("basic")
+                    .orderWeight(0)
                     .createTime(date)
                     .updateTime(date)
                     .deleteType(0).build();
@@ -53,6 +54,7 @@ public class InitServiceImpl {
                         .confValue(currentVersion.getConfValue())
                         .title("上一个版本")
                         .module("basic")
+                        .orderWeight(orderWeight)
                         .createTime(date)
                         .updateTime(date)
                         .deleteType(0)