bug修改

Signed-off-by: lijunqing <lijunqing@dashoo.cn>

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

@@ -123,21 +123,30 @@ func (this *BadRecordController) AddBadRecord() {
 		//更新准入表状态
 		if model.Wzstatus!=""{
 			var supplierCert suppliercert.OilSupplierCert
-			supplierCert.InFlag=model.Wzstatus
-			cols := []string{ "InFlag"}
-			err=svc.UpdateEntityBywheretbl(OilSupplierCertName,&supplierCert, cols,"SupplierId='"+model.Companycode+"' and SupplierTypeCode='01'")
+			tempCount,_:=svc.GetCount(&supplierCert,"SupplierId='"+model.Companycode+"' and SupplierTypeCode='01'")
+			if tempCount>0{
+				supplierCert.InFlag=model.Wzstatus
+				cols := []string{ "InFlag"}
+				err=svc.UpdateEntityBywheretbl(OilSupplierCertName,&supplierCert, cols,"SupplierId='"+model.Companycode+"' and SupplierTypeCode='01'")
+			}
 		}
 		if model.Jjstatus!=""{
 			var supplierCert suppliercert.OilSupplierCert
-			supplierCert.InFlag=model.Jjstatus
-			cols := []string{ "InFlag"}
-			err=svc.UpdateEntityBywheretbl(OilSupplierCertName,&supplierCert, cols,"SupplierId='"+model.Companycode+"' and SupplierTypeCode='02'")
+			tempCount,_:=svc.GetCount(&supplierCert,"SupplierId='"+model.Companycode+"' and SupplierTypeCode='02'")
+			if tempCount>0 {
+				supplierCert.InFlag = model.Jjstatus
+				cols := []string{"InFlag"}
+				err = svc.UpdateEntityBywheretbl(OilSupplierCertName, &supplierCert, cols, "SupplierId='"+model.Companycode+"' and SupplierTypeCode='02'")
+			}
 		}
 		if model.Jfstatus!=""{
 			var supplierCert suppliercert.OilSupplierCert
-			supplierCert.InFlag=model.Jfstatus
-			cols := []string{ "InFlag"}
-			err=svc.UpdateEntityBywheretbl(OilSupplierCertName,&supplierCert, cols,"SupplierId='"+model.Companycode+"' and SupplierTypeCode='03'")
+			tempCount,_:=svc.GetCount(&supplierCert,"SupplierId='"+model.Companycode+"' and SupplierTypeCode='03'")
+			if tempCount>0 {
+				supplierCert.InFlag = model.Jfstatus
+				cols := []string{"InFlag"}
+				err = svc.UpdateEntityBywheretbl(OilSupplierCertName, &supplierCert, cols, "SupplierId='"+model.Companycode+"' and SupplierTypeCode='03'")
+			}
 		}
 
 		if err == nil {
@@ -155,28 +164,42 @@ func (this *BadRecordController) AddBadRecord() {
 		model.Createon = time.Now()
 		model.Createby = this.User.Realname
 		model.Createuserid, _ = utils.StrTo(this.User.Id).Int()
-
-		_, err := svc.InsertEntityBytbl(BaseBadRecord, &model)
-
+		var err error
 		//更新准入表状态
 		if model.Wzstatus!=""{
 			var supplierCert suppliercert.OilSupplierCert
-			supplierCert.InFlag=model.Wzstatus
-			cols := []string{ "InFlag"}
-			err=svc.UpdateEntityBywheretbl(OilSupplierCertName,&supplierCert, cols,"SupplierId='"+model.Companycode+"' and SupplierTypeCode='01'")
+			tempCount,_:=svc.GetCount(&supplierCert,"SupplierId='"+model.Companycode+"' and SupplierTypeCode='01'")
+			if tempCount>0{
+				supplierCert.InFlag=model.Wzstatus
+				cols := []string{ "InFlag"}
+				err=svc.UpdateEntityBywheretbl(OilSupplierCertName,&supplierCert, cols,"SupplierId='"+model.Companycode+"' and SupplierTypeCode='01'")
+			}else{
+				model.Wzstatus=""
+			}
 		}
 		if model.Jjstatus!=""{
 			var supplierCert suppliercert.OilSupplierCert
-			supplierCert.InFlag=model.Jjstatus
-			cols := []string{ "InFlag"}
-			err=svc.UpdateEntityBywheretbl(OilSupplierCertName,&supplierCert, cols,"SupplierId='"+model.Companycode+"' and SupplierTypeCode='02'")
+			tempCount,_:=svc.GetCount(&supplierCert,"SupplierId='"+model.Companycode+"' and SupplierTypeCode='02'")
+			if tempCount>0 {
+				supplierCert.InFlag = model.Jjstatus
+				cols := []string{"InFlag"}
+				err = svc.UpdateEntityBywheretbl(OilSupplierCertName, &supplierCert, cols, "SupplierId='"+model.Companycode+"' and SupplierTypeCode='02'")
+			}else{
+				model.Jjstatus=""
+			}
 		}
 		if model.Jfstatus!=""{
 			var supplierCert suppliercert.OilSupplierCert
-			supplierCert.InFlag=model.Jfstatus
-			cols := []string{ "InFlag"}
-			err=svc.UpdateEntityBywheretbl(OilSupplierCertName,&supplierCert, cols,"SupplierId='"+model.Companycode+"' and SupplierTypeCode='03'")
+			tempCount,_:=svc.GetCount(&supplierCert,"SupplierId='"+model.Companycode+"' and SupplierTypeCode='03'")
+			if tempCount>0 {
+				supplierCert.InFlag = model.Jfstatus
+				cols := []string{"InFlag"}
+				err = svc.UpdateEntityBywheretbl(OilSupplierCertName, &supplierCert, cols, "SupplierId='"+model.Companycode+"' and SupplierTypeCode='03'")
+			}else{
+				model.Jfstatus=""
+			}
 		}
+		_, err = svc.InsertEntityBytbl(BaseBadRecord, &model)
 		if err == nil {
 			errinfo.Message = "保存成功"
 			errinfo.Code = 2

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

@@ -60,11 +60,19 @@ func (this *PaymentInfoController) GetEntityList() {
 	//var list []suppliercert.OilSupplierCert
 
 	svcPerm := permission.GetPermissionService(utils.DBE)
+
+	var registerUser register.OilCorporateInfo
+	sql := " UserName='" + this.User.Username + "'"
+	svcPerm.GetEntity(&registerUser,sql)
+
 	isauth := svcPerm.IsAuthorized(this.User.Id, "oil_supplier.marketAccess.AllRecord")
 	if !svcPerm.IsAdmin(this.User.Id) && !isauth {
-		where = where + " and p.CreateUserId = '" + this.User.Id + "'"
+
+		where = where + " and (p.CreateUserId = '" + this.User.Id + "' or s.CommercialNo='"+registerUser.CommercialNo+"') "
 	}
 
+
+
 	var paylist []paymentinfo.PaymentinfoList
 	svc := paymentinfo.GetPaymentService(utils.DBE)
 	total := svc.GetPaymentinfoList(page.CurrentPage, page.Size, orderby, asc, &paylist, where)

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

@@ -1461,7 +1461,7 @@ func (this *OilSupplierController) GetEntityByName() {
 	var sqlsus string
 	sqlsus = `select 1 from ` + OilSupplierName + ` a `
 	sqlsus += ` left join ` + OilSupplierCertName + ` b on b.SupplierId = a.Id`
-	sqlsus += ` where a.SupplierName ='` + name + `' and b.InFlag='2'`
+	sqlsus += ` where a.SupplierName ='` + name + `' and b.InFlag='2' and b.SupplierTypeCode='` + typecode + `'`
 	var tempMap []map[string]string
 	tempMap,_=svc.DBE.QueryString(sqlsus)
 
@@ -1833,7 +1833,7 @@ func (this *OilSupplierController) IsCanApply() {
 		//判断是否是暂停
 		if this.User.IsCompanyUser==1{
 			var tempMap []map[string]string
-			sql:= "select 1 from OilSupplier a left join OilSupplierCert b on a.Id=b.SupplierId where (b.CreateUserId = '" + this.User.Id + "' or a.CommercialNo='"+ registerUser.CommercialNo+"') and b.InFlag='2'"
+			sql:= "select 1 from OilSupplier a left join OilSupplierCert b on a.Id=b.SupplierId where (b.CreateUserId = '" + this.User.Id + "' or a.CommercialNo='"+ registerUser.CommercialNo+"') and b.InFlag='2' and b.SupplierTypeCode='"+Type+"'"
 			tempMap,_=svc.DBE.QueryString(sql)
 			if tempMap!=nil && tempMap[0]["1"] !="" {
 				errinfo.Message = "已暂停，不可申请"