diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeOperationHistoryService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeOperationHistoryService.java
index 094baed605..7f0ba1752c 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeOperationHistoryService.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeOperationHistoryService.java
@@ -98,10 +98,11 @@ public interface CodeOperationHistoryService extends BaseService<CodeOperationHi
      * 获取操作历史记录
      * @author zhaoqifeng
      * @date 2020/7/16 16:53
-     * @param codeId
+     * @param customerId
+     * @param clientType
      * @return com.epmet.dto.result.CodeHistoryResultDTO
      */
-    List<CodeHistoryResultDTO> getHistoryList(String codeId);
+    List<CodeHistoryResultDTO> getHistoryList(String customerId, String clientType);
 
     /**
      * 更新描述
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeOperationHistoryServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeOperationHistoryServiceImpl.java
index c75f01637f..c50199c644 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeOperationHistoryServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeOperationHistoryServiceImpl.java
@@ -103,8 +103,8 @@ public class CodeOperationHistoryServiceImpl extends BaseServiceImpl<CodeOperati
     }
 
     @Override
-    public List<CodeHistoryResultDTO> getHistoryList(String codeId) {
-        return baseDao.selectHistoryListByCode(codeId);
+    public List<CodeHistoryResultDTO> getHistoryList(String customerId, String clientType) {
+        return baseDao.selectHistoryList(customerId, clientType);
     }
 
     @Override
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java
index e282dddf7a..d07bf811bf 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java
@@ -492,7 +492,9 @@ public class CodeServiceImpl implements CodeService {
 	public PageData history(CodeCommonFormDTO formDTO) {
 		PageHelper.startPage(formDTO.getPage(), formDTO.getLimit());
 		//获取上传代码信息
-		List<CodeHistoryResultDTO> list = codeOperationHistoryService.getHistoryList(formDTO.getCodeId());
+		CodeCustomerDTO code = codeCustomerService.get(formDTO.getCodeId());
+		//获取上传代码信息
+		List<CodeHistoryResultDTO> list = codeOperationHistoryService.getHistoryList(code.getCustomerId(), code.getClientType());
 		PageInfo<CodeHistoryResultDTO> pageInfo = new PageInfo<>(list);
 		return new PageData<>(list, pageInfo.getTotal());
 	}