From d4fed92631b4234d2c78311d9a44dadda90b20e0 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Thu, 24 Oct 2024 16:47:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/yxt/customer/apiadmin/CrmCustomerTempRest.java   | 2 +-
 .../yxt/customer/biz/crmcustomer/CrmCustomerTempMapper.java   | 2 +-
 .../yxt/customer/biz/crmcustomer/CrmCustomerTempMapper.xml    | 4 ++--
 .../yxt/customer/biz/crmcustomer/CrmCustomerTempService.java  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/yxt/customer/apiadmin/CrmCustomerTempRest.java b/src/main/java/com/yxt/customer/apiadmin/CrmCustomerTempRest.java
index 2282dc4..6a0afc3 100644
--- a/src/main/java/com/yxt/customer/apiadmin/CrmCustomerTempRest.java
+++ b/src/main/java/com/yxt/customer/apiadmin/CrmCustomerTempRest.java
@@ -145,7 +145,7 @@ public class CrmCustomerTempRest {
     @GetMapping("/getCustomerByOrgSid")
     public ResultBean getCustomerByOrgSid(@RequestParam("orgSid") String orgSid) {
         ResultBean rb = ResultBean.fireFail();
-        Integer w = crmCustomerTempService.getCustomerByOrgSid(orgSid);
+        List<CrmCustomerTempVo> w = crmCustomerTempService.getCustomerByOrgSid(orgSid);
         return rb.success().setData(w);
     }
 }
diff --git a/src/main/java/com/yxt/customer/biz/crmcustomer/CrmCustomerTempMapper.java b/src/main/java/com/yxt/customer/biz/crmcustomer/CrmCustomerTempMapper.java
index 89d535d..e488150 100644
--- a/src/main/java/com/yxt/customer/biz/crmcustomer/CrmCustomerTempMapper.java
+++ b/src/main/java/com/yxt/customer/biz/crmcustomer/CrmCustomerTempMapper.java
@@ -36,5 +36,5 @@ public interface CrmCustomerTempMapper extends BaseMapper<CrmCustomerTemp> {
 
     int selBySid(String customerSid);
     int updateRemindAndByCustomerSid(@Param("customerSid") String customerSid, @Param("remind_day") String remind_day, @Param("remind_remark") String remind_remark, @Param("isOnRemind") String isOnRemind, @Param("isOnRemindkey") String isOnRemindkey, @Param("follow_state") String follow_state);
-    int getCustomerByOrgSid(@Param("orgSid") String orgSid);
+    List<CrmCustomerTempVo> getCustomerByOrgSid(@Param("orgSid") String orgSid);
 }
diff --git a/src/main/java/com/yxt/customer/biz/crmcustomer/CrmCustomerTempMapper.xml b/src/main/java/com/yxt/customer/biz/crmcustomer/CrmCustomerTempMapper.xml
index e51ad17..e0d4411 100644
--- a/src/main/java/com/yxt/customer/biz/crmcustomer/CrmCustomerTempMapper.xml
+++ b/src/main/java/com/yxt/customer/biz/crmcustomer/CrmCustomerTempMapper.xml
@@ -31,8 +31,8 @@
         from crm_customer
         where sid = #{customerSid}
     </select>
-    <select id="getCustomerByOrgSid" resultType="java.lang.Integer">
-        select count(a.sid) from crm_customer a LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid where s.orgSidPath like #{orgSid} and a.isDelete !='1'
+    <select id="getCustomerByOrgSid" resultType="com.yxt.customer.biz.crmcustomer.CrmCustomerTempVo">
+        select * from crm_customer a LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid where s.orgSidPath like #{orgSid} and a.isDelete !='1'
     </select>
     <update id="updateRemindAndByCustomerSid">
         UPDATE crm_customer
diff --git a/src/main/java/com/yxt/customer/biz/crmcustomer/CrmCustomerTempService.java b/src/main/java/com/yxt/customer/biz/crmcustomer/CrmCustomerTempService.java
index b705dcd..19c6835 100644
--- a/src/main/java/com/yxt/customer/biz/crmcustomer/CrmCustomerTempService.java
+++ b/src/main/java/com/yxt/customer/biz/crmcustomer/CrmCustomerTempService.java
@@ -190,7 +190,7 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
     public int updateRemindAndByCustomerSid(String customerSid, String remind_day, String remind_remark, String isOnRemind, String isOnRemindkey, String follow_state) {
         return baseMapper.updateRemindAndByCustomerSid(customerSid, remind_day, remind_remark, isOnRemind, isOnRemindkey, follow_state);
     }
-    public Integer getCustomerByOrgSid(String orgSid) {
+    public List<CrmCustomerTempVo> getCustomerByOrgSid(String orgSid) {
         return baseMapper.getCustomerByOrgSid(orgSid);
     }
 }