diff --git a/src/main/java/com/xujie/modules/srm/data/SrmSupplierData.java b/src/main/java/com/xujie/modules/srm/data/SrmSupplierData.java index f14098d..f1055ce 100644 --- a/src/main/java/com/xujie/modules/srm/data/SrmSupplierData.java +++ b/src/main/java/com/xujie/modules/srm/data/SrmSupplierData.java @@ -16,12 +16,12 @@ public class SrmSupplierData extends SrmSupplier { this.groupDesc = groupDesc; } - public String getSupplierGroupDesc() { - return this.groupDesc; + private String groupDocType; + public String getGroupDocType() { + return this.groupDocType; } - public void setSupplierGroupDesc(String groupDesc) { - this.groupDesc = groupDesc; + public void setGroupDocType(String groupDocType) { + this.groupDocType = groupDocType; } - } \ No newline at end of file diff --git a/src/main/resources/mapper/srm/SrmSupplierMapper.xml b/src/main/resources/mapper/srm/SrmSupplierMapper.xml index 6923ea9..7aa5474 100644 --- a/src/main/resources/mapper/srm/SrmSupplierMapper.xml +++ b/src/main/resources/mapper/srm/SrmSupplierMapper.xml @@ -22,12 +22,12 @@ s.Other_contact1,s.Other_contact2,s.Other_contact3, s.Memo FROM srm_supplier s LEFT JOIN SupplierGroup sg ON sg.supplier_group = s.supplier_group - AND sg.Site = s.site LEFT JOIN Currency c ON c.Currency = s.Currency + AND sg.Site = s.site LEFT JOIN Currency c ON c.Currency = s.Currency AND c.Site = s.site LEFT JOIN Tax t ON t.TaxCode = s.TaxCode AND t.Site = s.site LEFT JOIN DeliveryTerm dt ON dt.DeliveryTermID = s.DeliveryTerm - AND dt.Site = s.site + AND dt.Site = s.site LEFT JOIN PaymentTerm pt ON pt.PaymentTermID = s.PaymentTerm AND pt.Site = s.site @@ -52,7 +52,7 @@ AND s.Active = #{query.active} - ORDER BY s.create_date DESC + ORDER BY id