|
|
@@ -1279,6 +1279,7 @@ func (this *SelectController) FileList() {
|
|
|
where = where + " and EffectDate>='" + minDate + "' and EffectDate<='" + maxDate + "'"
|
|
|
}
|
|
|
}
|
|
|
+ where = where + " and IsDelete = 0 and SupType not in (2, 4) "
|
|
|
|
|
|
total := svc.GetPagingEntitiesWithoutAccCode(page.CurrentPage, page.Size, orderby, asc, &list, where)
|
|
|
var datainfo DataInfo
|
|
|
@@ -1569,14 +1570,14 @@ func (this *SelectController) GetSupplierInfo() {
|
|
|
var suppCertList []supplier.OilSupplierSelect2
|
|
|
svc.GetMyPagingEntitiesWithOrderBytbl2(&suppCertList, where)
|
|
|
|
|
|
- for i,suppCert := range suppCertList {
|
|
|
+ for i, suppCert := range suppCertList {
|
|
|
var fileList []supplierfile.OilSupplierFileSelect
|
|
|
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 {
|
|
|
+ for ii, file := range fileList {
|
|
|
var fileList1 []supplierfile.OilSupplierFileSelect1
|
|
|
fileArr := strings.Split(file.FileUrl, "$")
|
|
|
- for _,file1 := range fileArr {
|
|
|
+ for _, file1 := range fileArr {
|
|
|
var fileList2 supplierfile.OilSupplierFileSelect1
|
|
|
fileArr1 := strings.Split(file1, "|")
|
|
|
fileList2.FileUrl = fileArr1[0]
|