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; }