From dce5f099e76ecfa92ad708a3d5565a67844ceda2 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 25 二月 2025 12:34:28 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/CustomerMapper.xml | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/sd/CustomerMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/CustomerMapper.xml
index 1761017..c0e41ee 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/CustomerMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/CustomerMapper.xml
@@ -115,7 +115,9 @@
a.*,
b.project,
b.salesman_id,
- b.salesman
+ b.salesman,
+ b.contacts,
+ b.contact_number
from
sd.customer as a
left join (SELECT
@@ -128,6 +130,8 @@
o.project,
o.salesman_id,
o.salesman,
+ o.contacts,
+ o.contact_number,
o.customer_id
FROM
sd.ORDER AS o
@@ -138,7 +142,7 @@
</select>
<select id="getProjectList">
- select * from(select project,salesman_id,salesman,id from sd.`order`
+ select * from(select project,salesman_id as salesmanId,salesman,contacts,contact_number as contactNumber,id from sd.`order`
where customer_id = #{id}
group by project
) as a
--
Gitblit v1.8.0