Merge remote-tracking branch 'origin/master'

guoshilong

2022-08-26 17cfbc75dc326f3e5963ee17c99d6516497f8cf1

 src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.xml

@@ -17,6 +17,12 @@
        <if test="traceability.tenantId!=null and traceability.tenantId!=''">
            and st.tenant_id = #{traceability.tenantId}
        </if>
        <if test="traceability.deptId != null and traceability.deptId != ''">
            and st.dept_id = #{traceability.deptId}
        </if>
        <if test="traceability.bind !=null and traceability.bind !=''">
            and st.bind = #{traceability.bind}
        </if>
    </select>

    <!--自定义查询溯源码分页数据-->