wip:清单

src/jfw/modules/publicapply/src/detail/dao/bidding.go

@@ -289,37 +289,37 @@ func (bi *BidInfo) BiddingDataFormatNoPower(obj map[string]interface{}, id, deta
 			bi.Abstract.Default.DeliverCity = subStr
 			bi.Abstract.Default.DeliverDistrict = subStr
 			bi.Abstract.Default.DeliverDetail = subStr
-			if obj["purchasinglist"] != nil {
-				purchasingList := common.ObjArrToMapArr(obj["purchasinglist"].([]interface{}))
-				b, err := json.Marshal(purchasingList)
-				if err == nil && len(b) > 0 {
-					var pls []entity.Purchasing
-					err = json.Unmarshal(b, &pls)
-					if err == nil && len(pls) > 0 {
-						for _, v := range pls {
-							if strings.TrimSpace(v.ItemName) == "" {
-								continue
-							}
-							bi.Abstract.Default.PurchasingList = append(bi.Abstract.Default.PurchasingList, entity.PurchasingList{
-								Number:      v.Number,   //
-								Table:       v.Table,    //
-								ItemName:    v.ItemName, //
-								Model:       v.Model,
-								UnitPrice:   v.UnitPrice,
-								Root:        v.Root,
-								TotalPrice:  v.TotalPrice,
-								Score:       v.Score,
-								BrandName:   v.BrandName,
-								UnitName:    v.UnitName,
-								Code:        v.Code,
-								Reliability: v.Reliability,
-							})
+		}
+		if obj["purchasinglist"] != nil {
+			purchasingList := common.ObjArrToMapArr(obj["purchasinglist"].([]interface{}))
+			b, err := json.Marshal(purchasingList)
+			if err == nil && len(b) > 0 {
+				var pls []entity.Purchasing
+				err = json.Unmarshal(b, &pls)
+				if err == nil && len(pls) > 0 {
+					for _, v := range pls {
+						if strings.TrimSpace(v.ItemName) == "" {
+							continue
 						}
+						bi.Abstract.Default.PurchasingList = append(bi.Abstract.Default.PurchasingList, entity.PurchasingList{
+							Number:      v.Number,   //
+							Table:       v.Table,    //
+							ItemName:    v.ItemName, //
+							Model:       v.Model,
+							UnitPrice:   v.UnitPrice,
+							Root:        v.Root,
+							TotalPrice:  v.TotalPrice,
+							Score:       v.Score,
+							BrandName:   v.BrandName,
+							UnitName:    v.UnitName,
+							Code:        v.Code,
+							Reliability: v.Reliability,
+						})
 					}
 				}
-				if err != nil {
-					log.Println("purchasinglist json  err:", err.Error())
-				}
+			}
+			if err != nil {
+				log.Println("purchasinglist json  err:", err.Error())
 			}
 		}
 	}