|
|
@@ -69,13 +69,13 @@ func (s *OilSupplierService) GetMyPagingEntitiesWithOrderBytbl2(supplierTableNam
|
|
|
var resultsSlice []map[string][]byte
|
|
|
|
|
|
//获取总记录数
|
|
|
- sqlCount := `select count(DISTINCT a.ID) from ` + supplierTableName + ` a `
|
|
|
+ sqlCount := `select count(DISTINCT b.Id) from ` + supplierTableName + ` a `
|
|
|
sqlCount += ` left join ` + supplierCertTableName + " b on b.SupplierId = a.Id"
|
|
|
sqlCount += ` left join ` + "OilSupplierCert2File c on c.SupplierId = a.Id and c.SupplierCertId = b.Id"
|
|
|
sqlCount += ` where ` + where
|
|
|
|
|
|
var sql string
|
|
|
- sql = `select DISTINCT a.*, b.Id as CertId, b.AccessCardNo, b.SupplierTypeCode, b.SupplierTypeName, b.InFlag, b.ApplyTime, `
|
|
|
+ sql = `select DISTINCT b.Id as CertId, a.*, b.AccessCardNo, b.SupplierTypeCode, b.SupplierTypeName, b.InFlag, b.ApplyTime, `
|
|
|
sql += ` b.WorkerTotal, `
|
|
|
sql += ` b.ContractNum, `
|
|
|
sql += ` b.UniversityNum, `
|