后:安全管理平台对外接口

src/dashoo.cn/backend/api/business/oilsupplier/supplier/oilsupplier.go

@@ -461,6 +461,7 @@ type OilSupplierSelect2 struct {
 	City             string    //注册市
 	Street           string    //注册区
 	InStyle          string    //准入方式
+	InFlag           string    //状态
 	FileList []supplierfile.OilSupplierFileSelect
 	SubList []suppliercertsub.OilSupplierCertSubSelect
 }

src/dashoo.cn/backend/api/controllers/oilsupplier/select.go

@@ -1563,7 +1563,7 @@ func (this *SelectController) GetSupplierInfo() {
 		this.ServeJSON()
 		return
 	}
-	where := "a.CommercialNo = '" + commercialNo + "'"
+	where := "b.InFlag in (1,2,3) and a.CommercialNo = '" + commercialNo + "'"
 
 	svc := selectbusiness.GetSelectService(utils.DBE)
 	var suppCertList []supplier.OilSupplierSelect2
@@ -1571,7 +1571,7 @@ func (this *SelectController) GetSupplierInfo() {
 
 	for i,suppCert := range suppCertList {
 		var fileList []supplierfile.OilSupplierFileSelect
-		where1 := "SupplierId = " + strconv.Itoa(suppCert.Id) + " and SupplierTypeCode in ('000','" + suppCert.SupplierTypeCode + "')"
+		where1 := "IsDelete = 0 and SupType not in (2,4) and SupplierId = " + strconv.Itoa(suppCert.Id) + " and SupplierTypeCode in ('000','" + suppCert.SupplierTypeCode + "')"
 		svc.GetFileList(&fileList, where1)
 		for ii,file := range fileList {
 			var fileList1 []supplierfile.OilSupplierFileSelect1
@@ -1588,7 +1588,7 @@ func (this *SelectController) GetSupplierInfo() {
 		suppCertList[i].FileList = fileList
 
 		var subList []suppliercertsub.OilSupplierCertSubSelect
-		where1 = "SupplierId = " + strconv.Itoa(suppCert.Id) + " and SupplierCertId = " + strconv.Itoa(suppCert.CertId)
+		where1 = "Type in (1, 3) and SupplierId = " + strconv.Itoa(suppCert.Id) + " and SupplierCertId = " + strconv.Itoa(suppCert.CertId)
 		svc.GetEntitysByWhere(OilSupplierCertSubName, where1, &subList)
 		suppCertList[i].SubList = subList
 	}