Merge branch 'zf' of https://sinanoaq.cn:8888/r/hazardInvestigationSystem

zhangfeng

2023-07-24 7d0209210d2d9cbef642bf159062528ff8e22c44

 src/main/java/com/gk/hotwork/Mapper/mybatis/InspectionHiddenDangerMapper.xml

@@ -31,7 +31,7 @@
            and s.inspection_name like concat("%",#{params.inspectionName},"%")
        </if>
        <if test="params.checkedCompanyName != null and params.checkedCompanyName != ''">
            and h.checked_company_name like concat("%",#{params.checkedCompanyName},"%")
            and s.checked_company_name like concat("%",#{params.checkedCompanyName},"%")
        </if>
        <if test="params.flag != null  and params.flag != '' ">
            and s.flag = #{params.flag}