diff --git a/src/com/engine/salary/biz/SIAccountBiz.java b/src/com/engine/salary/biz/SIAccountBiz.java
index d32a556b2..4ba839d57 100644
--- a/src/com/engine/salary/biz/SIAccountBiz.java
+++ b/src/com/engine/salary/biz/SIAccountBiz.java
@@ -2400,23 +2400,6 @@ public class SIAccountBiz extends Service {
         dto.setSocialPaySum(socialPaySum.toPlainString());
     }
 
-    private List<InsuranceSchemeDetailPO> encryptSchemeDetail(List<InsuranceSchemeDetailPO> source) {
-        source.forEach(item -> {
-            item.setUpperLimit(AESEncryptUtil.encrypt(item.getUpperLimit()));
-            item.setFixedCost(AESEncryptUtil.encrypt(item.getFixedCost()));
-            item.setLowerLimit(AESEncryptUtil.encrypt(item.getLowerLimit()));
-        });
-        return source;
-    }
-
-    private List<InsuranceSchemeDetailPO> decryptSchemeDetail(List<InsuranceSchemeDetailPO> encryptList) {
-        encryptList.forEach(item -> {
-            item.setUpperLimit(AESEncryptUtil.decrypt(item.getUpperLimit()));
-            item.setFixedCost(AESEncryptUtil.decrypt(item.getFixedCost()));
-            item.setLowerLimit(AESEncryptUtil.decrypt(item.getLowerLimit()));
-        });
-        return encryptList;
-    }
 
     /**
      * 查询台账id是否已经薪资核算核算过
diff --git a/src/com/engine/salary/biz/SISchemeBiz.java b/src/com/engine/salary/biz/SISchemeBiz.java
index 74dba143c..cb8374169 100644
--- a/src/com/engine/salary/biz/SISchemeBiz.java
+++ b/src/com/engine/salary/biz/SISchemeBiz.java
@@ -462,15 +462,6 @@ public class SISchemeBiz {
     }
 
 
-    private List<InsuranceSchemeDetailPO> encryptSchemeDetailList(List<InsuranceSchemeDetailPO> source) {
-        source.forEach(item -> {
-            item.setUpperLimit(AESEncryptUtil.encrypt(item.getUpperLimit()));
-            item.setFixedCost(AESEncryptUtil.encrypt(item.getFixedCost()));
-            item.setLowerLimit(AESEncryptUtil.encrypt(item.getLowerLimit()));
-        });
-        return source;
-    }
-
     private List<InsuranceSchemeDetailPO> decryptSchemeDetailList(List<InsuranceSchemeDetailPO> encryptList) {
         encryptList.forEach(item -> {
             item.setUpperLimit(AESEncryptUtil.decrypt(item.getUpperLimit()));
@@ -480,20 +471,6 @@ public class SISchemeBiz {
         return encryptList;
     }
 
-    private InsuranceSchemeDetailPO encryptSchemeDetail(InsuranceSchemeDetailPO item) {
-        item.setUpperLimit(AESEncryptUtil.encrypt(item.getUpperLimit()));
-        item.setFixedCost(AESEncryptUtil.encrypt(item.getFixedCost()));
-        item.setLowerLimit(AESEncryptUtil.encrypt(item.getLowerLimit()));
-        return item;
-    }
-
-    private InsuranceSchemeDetailPO decryptSchemeDetail(InsuranceSchemeDetailPO item) {
-        item.setUpperLimit(AESEncryptUtil.decrypt(item.getUpperLimit()));
-        item.setFixedCost(AESEncryptUtil.decrypt(item.getFixedCost()));
-        item.setLowerLimit(AESEncryptUtil.decrypt(item.getLowerLimit()));
-        return item;
-    }
-
     public int checkBeforeDeleteSocialscheme(Map<String, Object> params) {
         return getSIAccountUtilMapper().checkBeforeDeleteSocialscheme((Collection<Long>) params.get("ids")).get(0).getNum();
     }
diff --git a/src/com/engine/salary/encrypt/AESEncryptUtil.java b/src/com/engine/salary/encrypt/AESEncryptUtil.java
index bcf5d0dba..76a12259a 100644
--- a/src/com/engine/salary/encrypt/AESEncryptUtil.java
+++ b/src/com/engine/salary/encrypt/AESEncryptUtil.java
@@ -4,7 +4,6 @@ import com.engine.salary.sys.constant.SalarySysConstant;
 import com.engine.salary.sys.entity.po.SalarySysConfPO;
 import com.engine.salary.sys.enums.OpenEnum;
 import com.engine.salary.sys.service.impl.SalarySysConfServiceImpl;
-import com.wbi.util.StringUtil;
 import org.apache.commons.lang3.StringUtils;
 import weaver.general.AES;
 import weaver.general.BaseBean;
@@ -30,26 +29,13 @@ public class AESEncryptUtil {
      * @return 加密数据
      */
     public static String encrypt(String source) {
-        String isEncrypt = getSalarySysConfigValue();
         //防止初始化老数据时二次加密
-        if (StringUtils.isNotBlank(source) && OpenEnum.OPEN.getValue().equals(isEncrypt) && !source.startsWith(SalarySysConstant.PRE_SIGN_ENCRYPT)) {
+        if (StringUtils.isNotBlank(source) && !source.startsWith(SalarySysConstant.PRE_SIGN_ENCRYPT)) {
             return SalarySysConstant.PRE_SIGN_ENCRYPT + AES.encrypt(source, aesEncryptScrect);
         }
         return source;
     }
 
-    /**
-     * 应用设置是否开启加密
-     *
-     * @return
-     */
-    private static String getSalarySysConfigValue() {
-        SalarySysConfPO sysConfPO = salarySysConfService.getOneByCode(SalarySysConstant.OPEN_APPLICATION_ENCRYPT);
-        if (sysConfPO == null) {
-            return "1";
-        }
-        return sysConfPO.getConfValue();
-    }
 
     /**
      * AES解密
@@ -58,15 +44,11 @@ public class AESEncryptUtil {
      * @return 解密字符串
      */
     public static String decrypt(String encryptStr) {
-        SalarySysConfPO sysConfPo = salarySysConfService.getOneByCode(SalarySysConstant.OPEN_APPLICATION_ENCRYPT);
         if (StringUtils.isNotBlank(encryptStr)) {
             if (encryptStr.startsWith(SalarySysConstant.PRE_SIGN_ENCRYPT)) {
                 encryptStr = encryptStr.substring(4, encryptStr.length());
                 return AES.decrypt(encryptStr, aesEncryptScrect);
-            }
-            //第一版没有加AES_前缀为加密标识，所以初始解密时，需要根据是否有配置判断是否需要解密
-            //未配置加密设置时,需要解密
-            if (sysConfPo == null) {
+            } else {
                 return AES.decrypt(encryptStr, aesEncryptScrect);
             }
         }
@@ -81,13 +63,6 @@ public class AESEncryptUtil {
      */
     public static String closeEncryptSetting(String encryptStr) {
         SalarySysConfPO sysConfPo = salarySysConfService.getOneByCode(SalarySysConstant.OPEN_APPLICATION_ENCRYPT);
-//        if (StringUtils.isNotBlank(encryptStr) && encryptStr.startsWith(SalarySysConstant.PRE_SIGN_ENCRYPT)) {
-//            encryptStr = encryptStr.substring(4, encryptStr.length());
-//            return AES.decrypt(encryptStr, aesEncryptScrect);
-//        } else if (sysConfPo == null && StringUtils.isNotBlank(encryptStr)) {
-//            return AES.decrypt(encryptStr, aesEncryptScrect);
-//        }
-//        return encryptStr;
         if (encryptStr == null) {
             return null;
         } else {