Merge remote-tracking branch 'origin/master'

Houjie

2025-06-13 ac8e03a06d463aafcbe810af31e2da5037491a07

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ParaTurningToolsMapper.xml

@@ -10,6 +10,7 @@
            t2.type_name AS classifyName,
            t1.id AS toolId,
            t1.tool_code AS toolCode,
            t1.parama_table_name AS paramaTableName,
            t.sign_code AS signCode,
            t.chinese_name AS chineseName,
            t.foreign_language_name AS foreignLanguageName,
@@ -56,13 +57,6 @@
        FROM tms_para_turning_tools t
        LEFT JOIN tms_base_tools t1 ON t.tool_code = t1.id
        LEFT JOIN tms_tools_classify t2 on t.classify_id = t2.id
        <where>
            <if test="classifyId != null and classifyId != ''">
                AND t.classify_id = #{classifyId}
            </if>
            <if test="diameter != null and diameter != ''">
                AND t.diameter = #{diameter}
            </if>
        </where>
        ${ew.customSqlSegment}
    </select>
</mapper>