lining 6 anni fa
parent
commit
ed0a8c6bd4
1 ha cambiato i file con 28 aggiunte e 18 eliminazioni
  1. 28 18
      src/dashoo.cn/backend/api/controllers/oilsupplier/supplier.go

+ 28 - 18
src/dashoo.cn/backend/api/controllers/oilsupplier/supplier.go

@@ -1505,26 +1505,36 @@ func (this *OilSupplierController) AddEntity() {
 	}
 	var list []supplier.OilSupplierView
 	service := supplier.GetOilSupplierService(utils.DBE)
-	if model.Id <= 0 {
-		service.CheckRepeatApplyInfo(OilSupplierName, OilSupplierCertName, modelCertVM.SupplierTypeCode, model.SupplierName, model.CommercialNo, model.OrganCode, model.BankAccount, model.CompanyUrl, &list)
-		if len(list) > 0 {
-			errinfo.Message = "添加失败! 已存在相关企业的信息,不能重复申请"
-			errinfo.Code = -1
-			this.Data["json"] = &errinfo
-			this.ServeJSON()
-			return
-		}
-	} else {
-		service.CheckUpdateRepeatApplyInfo(OilSupplierName, OilSupplierCertName, modelCertVM.SupplierTypeCode, strconv.Itoa(model.Id), model.SupplierName, model.CommercialNo, model.OrganCode, model.BankAccount, model.CompanyUrl, &list)
-		if len(list) > 0 {
-			errinfo.Message = "添加失败! 已存在相关企业的信息,或与其他企业信息重复"
-			errinfo.Code = -1
-			this.Data["json"] = &errinfo
-			this.ServeJSON()
-			return
-		}
+
+	service.CheckRepeatApplyInfo(OilSupplierName, OilSupplierCertName, modelCertVM.SupplierTypeCode, model.SupplierName, model.CommercialNo, model.OrganCode, model.BankAccount, model.CompanyUrl, &list)
+	if len(list) > 0 {
+		errinfo.Message = "添加失败! 已存在相关企业的信息,不能重复申请"
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+		return
 	}
 
+	//if model.Id <= 0 {
+	//	service.CheckRepeatApplyInfo(OilSupplierName, OilSupplierCertName, modelCertVM.SupplierTypeCode, model.SupplierName, model.CommercialNo, model.OrganCode, model.BankAccount, model.CompanyUrl, &list)
+	//	if len(list) > 0 {
+	//		errinfo.Message = "添加失败! 已存在相关企业的信息,不能重复申请"
+	//		errinfo.Code = -1
+	//		this.Data["json"] = &errinfo
+	//		this.ServeJSON()
+	//		return
+	//	}
+	//} else {
+	//	service.CheckUpdateRepeatApplyInfo(OilSupplierName, OilSupplierCertName, modelCertVM.SupplierTypeCode, strconv.Itoa(model.Id), model.SupplierName, model.CommercialNo, model.OrganCode, model.BankAccount, model.CompanyUrl, &list)
+	//	if len(list) > 0 {
+	//		errinfo.Message = "添加失败! 已存在相关企业的信息,或与其他企业信息重复"
+	//		errinfo.Code = -1
+	//		this.Data["json"] = &errinfo
+	//		this.ServeJSON()
+	//		return
+	//	}
+	//}
+
 	var session *xorm.Session
 	session = utils.DBE.NewSession()
 	svc := supplier.GetOilSupplierSession(session)