diff --git a/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java b/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
index 98df09b13..cb0ec03ae 100644
--- a/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
+++ b/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
@@ -313,11 +313,11 @@ public class SalarySysConfServiceImpl extends Service implements SalarySysConfSe
             String isOpenEncrypt = param.getIsOpenEncrypt();
             if (StringUtils.isNotEmpty(isOpenEncrypt)) {
                 if (isOpenEncrypt.equals(OpenEnum.OPEN.getValue())) {
-                    saveSettingByType(isOpenEncrypt, OPEN_APPLICATION_ENCRYPT, "开启加密设置", "app");
                     //对数据库数据加解密
                     ThreadPoolUtil.fixedPoolExecute(ModulePoolEnum.erkai, "saveEncryptSetting", new LocalRunnable() {
                         @Override
                         public void execute() {
+                            saveSettingByType(isOpenEncrypt, OPEN_APPLICATION_ENCRYPT, "开启加密设置", "app");
                             Boolean aBoolean = encryptOrDecryptDbWithAsync(isOpenEncrypt, progressId);
                         }
                     });
@@ -326,10 +326,10 @@ public class SalarySysConfServiceImpl extends Service implements SalarySysConfSe
                         @Override
                         public void execute() {
                             Boolean aBoolean = encryptOrDecryptDbWithAsync(isOpenEncrypt, progressId);
+                            saveSettingByType(isOpenEncrypt, OPEN_APPLICATION_ENCRYPT, "开启加密设置", "app");
                         }
                     });
                     //不要调换方法的位置
-                    saveSettingByType(isOpenEncrypt, OPEN_APPLICATION_ENCRYPT, "开启加密设置", "app");
                 }
             }
             Util_DataCache.clearVal(AES_ENCRYPT_IN_PROGRESS);