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} + \ 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)