diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/CustomerArchive.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/CustomerArchive.java
index 0fc9777..fa780bb 100644
--- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/CustomerArchive.java
+++ b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/CustomerArchive.java
@@ -58,6 +58,9 @@ public class CustomerArchive extends TenantEntity {
@Schema(description = "客商全称")
private String fullName;
+ @Schema(description = "客商类型:external外部客商,internal内部组织")
+ private String customerKind;
+
@Schema(description = "客商性质")
private String customerNature;
diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/CustomerArchiveVO.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/CustomerArchiveVO.java
index 880566e..802ed9e 100644
--- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/CustomerArchiveVO.java
+++ b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/CustomerArchiveVO.java
@@ -82,10 +82,6 @@ public class CustomerArchiveVO extends CustomerArchive {
@Schema(description = "是否保存变更记录(仅提交时为 true,保存时不记录)")
private Boolean recordChange;
- @TableField(exist = false)
- @Schema(description = "客商类型:external外部客商,internal内部组织")
- private String customerKind;
-
@TableField(exist = false)
@Schema(description = "资金使用风险等级:high、medium、none")
private String fundUseRisk;
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CustomerArchiveExcel.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CustomerArchiveExcel.java
index cc15e8b..bd9c470 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CustomerArchiveExcel.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CustomerArchiveExcel.java
@@ -58,6 +58,9 @@ public class CustomerArchiveExcel implements Serializable {
private String fullName;
@ExcelProperty("客商类型")
+ private String customerKind;
+
+ @ExcelProperty("客商分类")
private String customerType;
@ExcelProperty("客商性质")
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/CustomerArchiveMapper.xml b/blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/CustomerArchiveMapper.xml
index f67cfed..6da293f 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/CustomerArchiveMapper.xml
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/CustomerArchiveMapper.xml
@@ -15,6 +15,7 @@
+
@@ -63,6 +64,7 @@
customer_code,
short_name,
full_name,
+ customer_kind,
customer_nature,
guangxi_top100,
unified_credit_code,
@@ -128,6 +130,9 @@
AND unified_credit_code LIKE #{creditCodeLike}
+
+ AND customer_kind = #{customer.customerKind}
+
AND customer_nature = #{customer.customerNature}
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/CustomerArchiveServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/CustomerArchiveServiceImpl.java
index 53c479c..3ff5574 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/CustomerArchiveServiceImpl.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/CustomerArchiveServiceImpl.java
@@ -461,6 +461,7 @@ public class CustomerArchiveServiceImpl extends BaseServiceImpl();
@@ -1423,10 +1448,11 @@ public class CustomerArchiveServiceImpl extends BaseServiceImpl