Browse Source

信息变更删除的资质 审批流程应看不见

wd 4 years ago
parent
commit
e0642a4570

+ 2 - 2
src/dashoo.cn/backend/api/controllers/oilsupplier/qualchange.go

@@ -281,7 +281,7 @@ func (this *QualChangeController) AuditFileList() {
 	if SupplierTypeCode != "" {
 		where = where + " and a.SupplierTypeCode in ( '000', '" + SupplierTypeCode + "')"
 	}
-	//where = where + " and (b.FileUrl != '' OR a.IsDelete = 1)"
+	where = where + " and a.IsDelete = 0"
 	var total int64
 	AuditStatus := this.GetString("Status")
 	if AuditStatus == "8" {
@@ -531,7 +531,7 @@ func (this *QualChangeController) EditQualChange() {
 	supplierfile.ModifiedUserId, _ = strconv.Atoi(this.User.Id)
 	supplierfile.ModifiedBy = this.User.Realname
 	supplierfile.OtherRemark = model.Remark
-	svc.UpdateEntityBywheretbl(OilSupplierFileName, &supplierfile, []string{"EffectDate", "FileUrl", "FileName", "ModifiedOn", "ModifiedUserId", "ModifiedBy", "OtherRemark"}, "Id = " + strconv.Itoa(model.Id))
+	svc.UpdateEntityBywheretbl(OilSupplierFileName, &supplierfile, []string{"EffectDate", "FileUrl", "FileName", "ModifiedOn", "ModifiedUserId", "ModifiedBy", "OtherRemark"}, "Id = "+strconv.Itoa(model.Id))
 
 	var err error
 	var entity qualchange.OilQualChangeDetail

+ 1 - 1
src/dashoo.cn/backend/api/controllers/tmpzcgf/tmpzcgf.go

@@ -1108,7 +1108,7 @@ func (this *TmpzcgfController) InsertOneSup() {
 		svc.GetEntityByWhere(OilSupplierName, "SupplierName = '"+model.SupplierName+"'", &model)
 		whereCert := "SupplierId = " + strconv.Itoa(model.Id)
 		if typeCodeName != "" {
-			whereCert += " and SupplierTypeName = '" + whereCert + "'"
+			whereCert += " and SupplierTypeName = '" + typeCodeName + "'"
 		}
 		svc.GetEntitysByWhere(OilSupplierCertName, whereCert, &certList)
 		for _, cert := range certList {