diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientMapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientMapper.java
index 19b326ba1..75c5912aa 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientMapper.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientMapper.java
@@ -75,6 +75,6 @@ public interface BasicdataClientMapper extends BaseMapper<BasicdataClientEntity>
 	 * 查询规则生成的客户编码列表
 	 * @return
 	 */
-    List<String> getFinallyClientCode();
+    List<String> getFinallyClientCode(@Param("tenantCode")String tenantCode);
 
 }
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientMapper.xml
index c23861cef..936756058 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientMapper.xml
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientMapper.xml
@@ -169,7 +169,7 @@
         DESC
     </select>
     <select id="getFinallyClientCode" resultType="java.lang.String">
-        SELECT client_code FROM `logpm_basicdata_client` WHERE is_deleted = 0 AND client_code LIKE 'HT00%' AND LENGTH(client_code) = 9 AND is_deleted = 0  ORDER BY client_code DESC
+        SELECT client_code FROM `logpm_basicdata_client` WHERE is_deleted = 0 AND client_code LIKE CONCAT(#{tenantCode},'%') AND LENGTH(client_code) = 9 AND is_deleted = 0  ORDER BY client_code DESC
     </select>
 
 </mapper>
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java
index 704f58530..9d4f442b4 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java
@@ -688,7 +688,7 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl<BasicdataClientM
 
 		String finaClientCode = redis.get(RedisKeyConstant.FINAL_CLIENT_CODE + AuthUtil.getTenantId());
 		if (StringUtils.isBlank(finaClientCode)) {
-			List<String> str = baseMapper.getFinallyClientCode();
+			List<String> str = baseMapper.getFinallyClientCode(tenantCode);
 			if(!str.isEmpty()){
 				finaClientCode = str.get(0);
 			}else{