From 4b0d7ec9b4559fd11f4b5944c8316d48ae33da0a Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 7 May 2024 11:15:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pms/pmssuppliertype/PmsSupplierTypeMapper.java | 2 +- .../biz/pms/pmssuppliertype/PmsSupplierTypeQuery.java | 11 +++-------- .../pms/pmssuppliertype/PmsSupplierTypeService.java | 8 ++++++++ 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeMapper.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeMapper.java index 0d8b88caa6..6c7bc06179 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeMapper.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeMapper.java @@ -55,6 +55,6 @@ public interface PmsSupplierTypeMapper extends BaseMapper { List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - @Select("select * from base_supplier_type") + @Select("select * from yxt_base.base_supplier_type") List selectListVo(); } \ No newline at end of file diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeQuery.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeQuery.java index 6325f085f5..1bc702c0f9 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeQuery.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeQuery.java @@ -49,14 +49,9 @@ import lombok.Data; public class PmsSupplierTypeQuery implements Query { @ApiModelProperty("供应商类型名称") - private String supplierTypeName; // 供应商类型名称 + private String supplierTypeName; @ApiModelProperty("供应商类型编码") private String supplierTypeCode; - @ApiModelProperty("使用组织sid") - private String useOrgSid; // 使用组织sid - @ApiModelProperty("创建组织名称") - private String createOrgName; // 创建组织名称 - @ApiModelProperty("创建组织sid") - private String createOrgSid; // 创建组织sid - + @ApiModelProperty("组织全路径") + private String orgPath; } diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeService.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeService.java index 559aa52bc9..5ace9e5083 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeService.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeService.java @@ -63,6 +63,14 @@ public class PmsSupplierTypeService extends MybatisBaseService listPageVo(PagerQuery pq) { PmsSupplierTypeQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); + String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData(); + if (StringUtils.isNotBlank(query.getSupplierTypeName())){ + qw.like("supplierTypeName",query.getSupplierTypeName()); + } + if (StringUtils.isNotBlank(query.getSupplierTypeCode())){ + qw.like("supplierTypeCode",query.getSupplierTypeCode()); + } + qw.eq("createOrgSid",createOrgSid); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null);