From 7cc63c62e1c7488d11c48a010e1699b6d4c30f02 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Thu, 24 Oct 2024 16:50:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/yxt/supplier/apiadmin/SupplierInfoRest.java | 2 +- .../com/yxt/supplier/biz/supplierinfo/SupplierInfoMapper.java | 4 ++-- .../yxt/supplier/biz/supplierinfo/SupplierInfoService.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/yxt/supplier/apiadmin/SupplierInfoRest.java b/src/main/java/com/yxt/supplier/apiadmin/SupplierInfoRest.java index e0fd2fe..118df3c 100644 --- a/src/main/java/com/yxt/supplier/apiadmin/SupplierInfoRest.java +++ b/src/main/java/com/yxt/supplier/apiadmin/SupplierInfoRest.java @@ -97,7 +97,7 @@ public class SupplierInfoRest { @GetMapping("/getSupplierCountByOrgSid") public ResultBean getSupplierCountByOrgSid(@RequestParam("orgSid") String orgSid){ ResultBean rb = ResultBean.fireFail(); - Integer w = SupplierInfoService.getSupplierCountByOrgSid(orgSid); + List w = SupplierInfoService.getSupplierCountByOrgSid(orgSid); return rb.success().setData(w); } } diff --git a/src/main/java/com/yxt/supplier/biz/supplierinfo/SupplierInfoMapper.java b/src/main/java/com/yxt/supplier/biz/supplierinfo/SupplierInfoMapper.java index 0427a4a..e7aa177 100644 --- a/src/main/java/com/yxt/supplier/biz/supplierinfo/SupplierInfoMapper.java +++ b/src/main/java/com/yxt/supplier/biz/supplierinfo/SupplierInfoMapper.java @@ -64,6 +64,6 @@ public interface SupplierInfoMapper extends BaseMapper { @Select("select * from supplier_info a LEFT JOIN ss_user.sys_organization as s ON a.createOrgSid = s.sid where s.orgSidPath like #{createOrgSid} and a.isDelete !='1'") List choiceSupplierInfo(String createOrgSid); - @Select("select count(*) from supplier_info a LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid where s.orgSidPath like #{useOrgSid} and a.isDelete !='1'") - Integer getSupplierCountByOrgSid(String useOrgSid); + @Select("select * from supplier_info a LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid where s.orgSidPath like #{useOrgSid} and a.isDelete !='1'") + List getSupplierCountByOrgSid(String useOrgSid); } \ No newline at end of file diff --git a/src/main/java/com/yxt/supplier/biz/supplierinfo/SupplierInfoService.java b/src/main/java/com/yxt/supplier/biz/supplierinfo/SupplierInfoService.java index 17f6512..222935c 100644 --- a/src/main/java/com/yxt/supplier/biz/supplierinfo/SupplierInfoService.java +++ b/src/main/java/com/yxt/supplier/biz/supplierinfo/SupplierInfoService.java @@ -189,8 +189,8 @@ public class SupplierInfoService extends MybatisBaseService supplierInfoChoiceList = baseMapper.choiceSupplierInfo(createOrgSid); return supplierInfoChoiceList; } - public Integer getSupplierCountByOrgSid(String useOrgSid) { - Integer supplierInfoChoiceList = baseMapper.getSupplierCountByOrgSid(useOrgSid); + public List getSupplierCountByOrgSid(String useOrgSid) { + List supplierInfoChoiceList = baseMapper.getSupplierCountByOrgSid(useOrgSid); return supplierInfoChoiceList; }