Merge remote-tracking branch 'origin/master'

xuhy

4 天以前 433bc1e314ecfd483379ca0e2e74e7c815d3261f

 ruoyi-system/src/main/resources/mapper/system/TErpIssueReportingMapper.xml

@@ -38,8 +38,11 @@
            <if test="query.status != null">
                AND status = #{query.status}
            </if>
            <if test="query.reportType != null and query.reportUserId !=null">
                AND report_type = #{query.reportType} and report_user_id =#{query.reportUserId}
            <if test="query.reportType != null ">
                AND report_type = #{query.reportType}
            </if>
            <if test="query.reportUserId !=null">
                and report_user_id =#{query.reportUserId}
            </if>
            <if test="query.createBy != null and query.createBy != ''">
                AND create_by LIKE concat('%',#{query.createBy},'%')