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 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 { 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 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 * 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' 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 getCustomerByOrgSid(String orgSid) { return baseMapper.getCustomerByOrgSid(orgSid); } }