在做派生和总成的关联查询时添加项目id条件

dao/me/implments/ProductFamily.dao.impl.go

@@ -107,14 +107,17 @@ func (impl *ProductFamilyDAOImplement) SelectOne(productFamilyId string) (*model
 	////查询车型配置零件
 	//var product []model.Product
 	//err = impl.session.Table(meta.Product.TableName).In("ProductId", productId).Find(&product)
-	condition := fmt.Sprintf("%s = %s and %s = %s",
+	condition := fmt.Sprintf("%s = %s and %s = %s and %s = %s",
 		meta.ProductFamilyRelate_PlantNr.ColumnName,
 		meta.Product_PlantNr.ColumnName,
 		meta.ProductFamilyRelate_ProductId.ColumnName,
-		meta.Product_ProductId.ColumnName)
+		meta.Product_ProductId.ColumnName,
+		meta.ProductFamilyRelate_ProjectId.ColumnName,
+		meta.Product_ProjectId.ColumnName,
+		)
 	li := make([]model.ProductFamilyRelateAndProduct, 0, 4)
 	session := impl.session.Table(meta.ProductFamilyRelate.TableName).Join("LEFT", meta.Product.TableName, condition)
-	err = session.Where(fmt.Sprintf("%s = ?", meta.ProductFamilyRelate_ProductFamilyId.ColumnName), productFamilyId).OrderBy(meta.ProductFamilyRelate_Pos.ColumnName).Find(&li)
+	err = session.Where(fmt.Sprintf("%s = ? and %s = ?", meta.ProductFamilyRelate_ProductFamilyId.ColumnName, meta.ProductFamilyRelate_ProjectId.ColumnName), productFamilyId, data.ProjectId).OrderBy(meta.ProductFamilyRelate_Pos.ColumnName).Find(&li)
 	if err != nil {
 		return nil, err
 	}

dao/me/implments/ProductFamilyRelate.dao.impl.go

@@ -340,15 +340,19 @@ func (impl *ProductFamilyRelateDAOImplement) SelectProductByFamilyIdForCreateSer
 		meta.ProductFamilyRelate_ProjectId.ColumnName,
 		meta.ProductFamilyRelate_ProductFamilyId.ColumnName,
 		meta.Product_CreateWorkOrderToggle.ColumnName)
-	condition := fmt.Sprintf("%s = %s and %s = %s",
+	condition := fmt.Sprintf("%s = %s and %s = %s and %s = %s",
 		meta.ProductFamilyRelate_PlantNr.ColumnName,
 		meta.Product_PlantNr.ColumnName,
 		meta.ProductFamilyRelate_ProductId.ColumnName,
-		meta.Product_ProductId.ColumnName)
+		meta.Product_ProductId.ColumnName,
+		meta.ProductFamilyRelate_ProjectId.ColumnName,
+		meta.Product_ProjectId.ColumnName,
+	)
 	err := impl.session.Table(impl.meta.TableName).Join("LEFT", meta.Product.TableName, condition).Where(where, parameters...).OrderBy(meta.ProductFamilyRelate_Pos.SortColumnName).Find(&result)
 	return result, err
 }
 
+
 /******************************************************************************
  *
  * @Reference LAPP_ACURA_MOM_BACKEND/dao/jit/ProductFamilyRelateDAO.GetMaxPos