diff --git a/src/main/java/com/eactive/eai/rms/onl/transaction/tracking/DbTrackingService.java b/src/main/java/com/eactive/eai/rms/onl/transaction/tracking/DbTrackingService.java
index 3432d99..d222405 100644
--- a/src/main/java/com/eactive/eai/rms/onl/transaction/tracking/DbTrackingService.java
+++ b/src/main/java/com/eactive/eai/rms/onl/transaction/tracking/DbTrackingService.java
@@ -1,5 +1,26 @@
 package com.eactive.eai.rms.onl.transaction.tracking;
 
+import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+import org.apache.commons.lang3.StringUtils;
+import org.json.simple.JSONObject;
+import org.json.simple.JSONValue;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.eactive.apim.portal.jpa.PersonalDataEncryptConverter;
 import com.eactive.apim.portal.monitoringcode.entity.MonitoringCodeId;
 import com.eactive.eai.common.EAITable;
 import com.eactive.eai.common.header.HeaderAction;
@@ -8,7 +29,11 @@ import com.eactive.eai.common.header.HeaderActionKeys;
 import com.eactive.eai.common.logger.HttpAdapterExtraLogVo;
 import com.eactive.eai.common.logger.mapper.HttpAdapterExtraLogMapper;
 import com.eactive.eai.common.util.MessageUtil;
-import com.eactive.eai.data.entity.onl.logger.*;
+import com.eactive.eai.data.entity.onl.logger.EAILogId;
+import com.eactive.eai.data.entity.onl.logger.HttpAdapterExtraLog;
+import com.eactive.eai.data.entity.onl.logger.HttpAdapterExtraLogId;
+import com.eactive.eai.data.entity.onl.logger.SubMessageLog;
+import com.eactive.eai.data.entity.onl.logger.SubMessageLogId;
 import com.eactive.eai.data.entity.onl.message.ServiceMessageEntity;
 import com.eactive.eai.data.entity.onl.message.ServiceMessageEntityId;
 import com.eactive.eai.data.entity.onl.transformer.layout.LayoutEntity;
@@ -26,7 +51,12 @@ import com.eactive.eai.rms.common.login.SessionManager;
 import com.eactive.eai.rms.data.entity.man.monitoringCode.service.MonitoringCodeService;
 import com.eactive.eai.rms.data.entity.onl.eaimsg.ServiceMessageService;
 import com.eactive.eai.rms.data.entity.onl.layout.LayoutService;
-import com.eactive.eai.rms.data.entity.onl.logger.*;
+import com.eactive.eai.rms.data.entity.onl.logger.EAILogDetailSearch;
+import com.eactive.eai.rms.data.entity.onl.logger.EAILogDto;
+import com.eactive.eai.rms.data.entity.onl.logger.EAILogSearch;
+import com.eactive.eai.rms.data.entity.onl.logger.EAILogService;
+import com.eactive.eai.rms.data.entity.onl.logger.HttpAdapterExtraLogService;
+import com.eactive.eai.rms.data.entity.onl.logger.SubMessageLogService;
 import com.eactive.eai.rms.data.entity.onl.transform.TransformService;
 import com.eactive.eai.rms.onl.common.exception.EMSRuntimeException;
 import com.eactive.eai.rms.onl.manage.adapter.adapter.AdapterManService;
@@ -38,26 +68,14 @@ import com.eactive.eai.transformer.dao.jdbc.LayoutJdbcDao;
 import com.eactive.eai.transformer.layout.Item;
 import com.eactive.eai.transformer.layout.Layout;
 import com.eactive.eai.transformer.layout.LayoutTypeManager;
-import com.eactive.eai.transformer.message.*;
+import com.eactive.eai.transformer.message.Message;
+import com.eactive.eai.transformer.message.MessageSetDataException;
+import com.eactive.eai.transformer.message.MonitoringVBytesMessage;
+import com.eactive.eai.transformer.message.MonitoringVEbcdicMessage;
+import com.eactive.eai.transformer.message.XMLMessage;
 import com.eactive.eai.transformer.util.IConv;
 import com.eactive.eai.util.HexaConverter;
 import com.ext.eai.common.stdmessage.STDMessageKeys;
-import org.apache.commons.lang3.StringUtils;
-import org.json.simple.JSONObject;
-import org.json.simple.JSONValue;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.io.UnsupportedEncodingException;
-import java.math.BigDecimal;
-import java.nio.ByteBuffer;
-import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
 
 @Service("dbTrackingService")
 @Transactional
@@ -85,6 +103,7 @@ public class DbTrackingService extends BaseService {
 	private final TransformService transformService;
 	private final LayoutJdbcDao layoutJdbcDao;
 	private final LayoutService layoutService;
+	private final PersonalDataEncryptConverter encryptConverter;
 
 	@Autowired
 	private AdapterManService adapterManService;
@@ -102,7 +121,8 @@ public class DbTrackingService extends BaseService {
 							ServiceMessageService serviceMessageService,
 							TransformService transformService,
 							LayoutJdbcDao layoutJdbcDao,
-							LayoutService layoutService) {
+							LayoutService layoutService,
+							PersonalDataEncryptConverter encryptConverter) {
 		this.comboService = comboService;
 		this.eaiLogService = eaiLogService;
 		this.eaiLogUIMapper = eaiLogUIMapper;
@@ -115,6 +135,7 @@ public class DbTrackingService extends BaseService {
 		this.transformService = transformService;
 		this.layoutJdbcDao = layoutJdbcDao;
 		this.layoutService = layoutService;
+		this.encryptConverter = encryptConverter;
 	}
 
 	public Page<EAILogUI> selectList(Pageable pageable,
@@ -222,7 +243,7 @@ public class DbTrackingService extends BaseService {
 
 		
 		if (!StringUtils.isBlank(data)) {
-			eaiLogUI.setBzwkdatactnt(data);
+			eaiLogUI.setBzwkdatactnt(encryptConverter.convertToEntityAttribute(data));
 		} else {
 			eaiLogUI.setBzwkdatactnt("");
 		}