|
|
@@ -721,7 +721,7 @@ func (this *OilContractController) ImportUpdate() {
|
|
|
|
|
|
if Column == "SecondUnit" {
|
|
|
var org organize.Base_Organize
|
|
|
- svc.GetEntityByWhere("Base_Organize", "Id = " + Value, &org)
|
|
|
+ svc.GetEntityByWhere("Base_Organize", "Id = "+Value, &org)
|
|
|
if Id != "" {
|
|
|
where += " and Id = " + Id + " and ImportStatus = 0 and ImportSecondUnit = '" + Class + "'"
|
|
|
sql = "update OilContract set SecondUnitName = '" + org.Fullname + "',SupplierName = '" + supp.SupplierName + "', " + Column + " = " + Value + " where " + where
|
|
|
@@ -1179,7 +1179,10 @@ func (this *OilContractController) GetNeedEvaList() {
|
|
|
|
|
|
var dataInfo DataInfo
|
|
|
dataInfo.Items = list
|
|
|
- dataInfo.CurrentItemCount = int64(len(list))
|
|
|
+ dataInfo.CurrentItemCount = 0
|
|
|
+ if list != nil {
|
|
|
+ dataInfo.CurrentItemCount = int64(len(list))
|
|
|
+ }
|
|
|
this.Data["json"] = &dataInfo
|
|
|
this.ServeJSON()
|
|
|
}
|