1、修改pc端固有风险筛选接口

censoft-rongtong/src/main/resources/mapper/system/RiskPlanInherentListMapper.xml

@@ -98,19 +98,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         AND dict_type = 'risk_plan_level'
         LEFT JOIN risk_plan rp ON  FIND_IN_SET( lb.id, rp.building_ids )
         <where>
+            <if test="name != null  and name != ''"> and rpil.name like concat('%', #{name}, '%')</if>
+            <if test="buildingName != null and buildingName != ''"> and lb.name like concat('%', #{buildingName}, '%')</if>
+            <if test="floorName != null and floorName != ''"> and lf.name like concat('%', #{floorName}, '%')</if>
+            <if test="roomName != null and roomName != ''"> and lr.name like concat('%', #{roomName}, '%')</if>
+            <if test="level != null  and level != ''"> and rpil.level = #{level}</if>
+            <if test="factor != null  and factor != ''"> and rpil.factor like concat('%', #{factor}, '%')</if>
+            <if test="type != null  and type != ''"> and rpil.type like concat('%', #{type}, '%')</if>
+            <if test="presenceLocation != null  and presenceLocation != ''"> and rpil.presence_location like concat('%', #{presenceLocation}, '%')</if>
             <if test="userId != null "> and rpil.user_id = #{userId}</if>
             <if test="roomId != null "> and rpil.room_id = #{roomId}</if>
             <if test="planId != null "> and rp.id = #{planId}</if>
-            <if test="name != null  and name != ''"> and rpil.name like concat('%', #{name}, '%')</if>
             <if test="pointType != null  and pointType != ''"> and rpil.point_type = #{pointType}</if>
             <if test="specialEquipment != null "> and rpil.special_equipment = #{specialEquipment}</if>
             <if test="safetyWarningSigns != null  and safetyWarningSigns != ''"> and rpil.safety_warning_signs = #{safetyWarningSigns}</if>
-            <if test="factor != null  and factor != ''"> and rpil.factor = #{factor}</if>
-            <if test="type != null  and type != ''"> and rpil.type = #{type}</if>
-            <if test="level != null  and level != ''"> and rpil.level = #{level}</if>
             <if test="riskLikelihood != null  and riskLikelihood != ''"> and rpil.risk_likelihood = #{riskLikelihood}</if>
             <if test="riskSeverity != null  and riskSeverity != ''"> and rpil.risk_severity = #{riskSeverity}</if>
-            <if test="presenceLocation != null  and presenceLocation != ''"> and rpil.presence_location = #{presenceLocation}</if>
             <if test="pictureFileIds != null  and pictureFileIds != ''"> and rpil.picture_file_ids = #{pictureFileIds}</if>
             <if test="measuresProject != null  and measuresProject != ''"> and rpil.measures_project = #{measuresProject}</if>
             <if test="measuresProjectFileIds != null  and measuresProjectFileIds != ''"> and rpil.measures_project_file_ids = #{measuresProjectFileIds}</if>