diff --git a/src/main/java/com/qs/serve/modules/bms/entity/vo/BmsCostCenterTreeVo.java b/src/main/java/com/qs/serve/modules/bms/entity/vo/BmsCostCenterTreeVo.java
index 896bfdd2..8fb608bc 100644
--- a/src/main/java/com/qs/serve/modules/bms/entity/vo/BmsCostCenterTreeVo.java
+++ b/src/main/java/com/qs/serve/modules/bms/entity/vo/BmsCostCenterTreeVo.java
@@ -17,14 +17,14 @@ import javax.validation.constraints.NotNull;
public class BmsCostCenterTreeVo extends TreeNode {
/** 科目名称 */
- @NotBlank(message = "科目名称不能为空")
- @Length(max = 50,message = "科目名称长度不能超过50字")
- private String subjectName;
+ @NotBlank(message = "成本中心名称不能为空")
+ @Length(max = 50,message = "成本中心名称长度不能超过50字")
+ private String name;
/** 科目编码 */
- @NotBlank(message = "科目编码不能为空")
- @Length(max = 50,message = "科目编码长度不能超过50字")
- private String subjectCode;
+ @NotBlank(message = "成本中心编码不能为空")
+ @Length(max = 50,message = "成本中心编码长度不能超过50字")
+ private String code;
/** 父级id */
@NotNull(message = "父级id不能为空")
diff --git a/src/main/resources/mapper/bms/BmsSupplierChannelMapper.xml b/src/main/resources/mapper/bms/BmsSupplierChannelMapper.xml
index 1558e1f7..f30af84b 100644
--- a/src/main/resources/mapper/bms/BmsSupplierChannelMapper.xml
+++ b/src/main/resources/mapper/bms/BmsSupplierChannelMapper.xml
@@ -55,6 +55,8 @@
and `bms_supplier`.`name` LIKE CONCAT('%',#{query.supplierName},'%')
and `bms_supplier`.`code` LIKE CONCAT('%',#{query.supplierCode},'%')
and `bms_supplier_channel`.`del_flag` = '0'
+ and `bms_channel`.`del_flag` = '0'
+ and `bms_supplier`.`del_flag` = '0'