diff --git a/src/com/engine/salary/encrypt/AESEncryptUtil.java b/src/com/engine/salary/encrypt/AESEncryptUtil.java
index 9350abfb4..e0368e80c 100644
--- a/src/com/engine/salary/encrypt/AESEncryptUtil.java
+++ b/src/com/engine/salary/encrypt/AESEncryptUtil.java
@@ -27,8 +27,8 @@ public class AESEncryptUtil {
      */
     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) && OpenEnum.OPEN.getValue().equals(isEncrypt) && !source.startsWith(SalarySysConstant.PRE_SIGN_ENCRYPT)&& source.length() != 32) {
             return SalarySysConstant.PRE_SIGN_ENCRYPT + AES.encrypt(source, aesEncryptScrect);
         }
         return source;
@@ -70,7 +70,7 @@ public class AESEncryptUtil {
             encryptStr = encryptStr.substring(4, encryptStr.length());
             return AES.decrypt(encryptStr, aesEncryptScrect);
         }
-        if (StringUtils.isNotBlank(encryptStr) && encryptStr.length() == 16) {
+        if (StringUtils.isNotBlank(encryptStr) && encryptStr.length() == 32) {
             return AES.decrypt(encryptStr, aesEncryptScrect);
         }
         return encryptStr;