后:业务流程查询bug

src/dashoo.cn/backend/api/business/oilsupplier/annualaudit/annualauditService.go

@@ -217,7 +217,7 @@ func (s *OilAnnualAuditService) GetProcessInfoAllWithOrderBytbl(pageIndex, items
 	//sqlCount += ` where ` + where
 
 	var sql string
-	sql = `select a.SupplierName, b.Id,`
+	sql = `select a.Id AS SupplierId, a.SupplierName, b.Id,`
 	sql += ` b.Status, b.SupplierTypeCode, `
 	sql += ` b.WorkflowId, b.ProcessKey, '1' as Type,`
 	sql += ` b.CreateOn, b.AccessCardNo, b.ModifiedOn As AddinTime,`
@@ -231,7 +231,7 @@ func (s *OilAnnualAuditService) GetProcessInfoAllWithOrderBytbl(pageIndex, items
 	sql += ` where ` + where1
 	sql += ` union `
 
-	sql += `select a.SupplierName, a.Id, `
+	sql += `select s.Id AS SupplierId,a.SupplierName, a.Id, `
 	sql += ` a.Status, a.AppendType SupplierTypeCode, `
 	sql += ` a.WorkflowId, a.ProcessKey, '2' as Type, a.CreateOn, a.AccessCardNo, a.ModifiedOn as AddinTime, u.Realname AS ContactName, u.Telephone AS Mobile,`
 	sql += ` case when uu.IsCompanyUser = 1 then org.FullName
@@ -246,7 +246,7 @@ func (s *OilAnnualAuditService) GetProcessInfoAllWithOrderBytbl(pageIndex, items
 	sql += ` where ` + where2
 	sql += ` union `
 
-	sql += `select a.SupplierName, a.Id, `
+	sql += `select s.Id AS SupplierId,a.SupplierName, a.Id, `
 	sql += ` a.Status, a.SupplierTypeName SupplierTypeCode, `
 	sql += ` a.WorkflowId, a.ProcessKey, '3' as Type, a.CreateOn, a.AccessCardNo, a.ModifiedOn as AddinTime, u.Realname AS ContactName, u.Telephone AS Mobile,`
 	sql += ` CASE WHEN uu.IsCompanyUser = 1 THEN org.FullName
@@ -261,7 +261,7 @@ func (s *OilAnnualAuditService) GetProcessInfoAllWithOrderBytbl(pageIndex, items
 	sql += ` where ` + where3
 	sql += ` union `
 
-	sql += `select a.SupplierName, a.Id, `
+	sql += `select s.Id AS SupplierId,a.SupplierName, a.Id, `
 	sql += ` a.Status,a.SupplierTypeCode, `
 	sql += ` a.WorkflowId, a.ProcessKey, '4' as Type, a.CreateOn, a.AccessCardNo, a.ModifiedOn as AddinTime, u.Realname AS ContactName, u.Telephone AS Mobile, `
 	sql += ` CASE WHEN uu.IsCompanyUser = 1 THEN org.FullName