修改销售台账和生产订单绑定逻辑，修复销售台账和生产订单页面展示数据bug

yinrw

2 天以前 bd63dcea170b3ceb86851f56a7a53b85b77027c2

 src/main/resources/mapper/basic/ProductModelMapper.xml

@@ -9,7 +9,6 @@
        <result column="product_id" property="productId" />
        <result column="model" property="model" />
        <result column="unit" property="unit" />
        <result column="speculative_trading_name" property="speculativeTradingName" />
        <result column="tenant_id" property="tenantId" />
        <result column="product_name" property="productName" />
        <result column="product_id" property="productId" />
@@ -24,6 +23,22 @@
            </if>
            <if test="c.productName != null and c.productName != ''">
                and p.product_name  like  concat('%',#{c.productName},'%')
            </if>
            <if test="c.topProductParentId != null and c.topProductParentId > 0">
                and p.id in (
                    WITH RECURSIVE product_tree AS (
                        SELECT id
                        FROM product
                        WHERE id = #{c.topProductParentId}
                        
                        UNION ALL
                        
                        SELECT p.id
                        FROM product p
                        INNER JOIN product_tree pt ON p.parent_id = pt.id
                    )
                    select id from product_tree
                )
            </if>
        </where>
        order by  pm.id
@@ -97,5 +112,19 @@

        ORDER BY pm.id DESC
    </select>
    <select id="getProductAndModelList" resultType="java.util.Map">
        select p.id as id,
               pm.id as modelId,
               p.product_name as productName ,
               pm.model as  model
        from product_model pm
        left join product p on p.id = pm.product_id
        order by p.id,pm.id desc
    </select>
    <select id="selectProductModelById" resultType="com.ruoyi.basic.pojo.ProductModel">
        select pm.model,p.product_name,pm.id from product_model pm
                 left join product p on p.id = pm.product_id
                 where pm.id = #{productModelId}
    </select>

</mapper>