Merge remote-tracking branch 'origin/dev_v2' into dev_v2

RuoYi-Vue-fast-master/src/main/resources/mybatis/business/TpElevatorModelMapper.xml

@@ -204,10 +204,10 @@
         <include refid="selectTpElevatorModelVo"/>
         <where>
             <if test="countryId != null and countryId != ''">
-                and target_country_ids like CONCAT('%,', #{countryId},',%')
+                and FIND_IN_SET(#{countryId},target_country_ids)
             </if>
             <if test="userId != null and userId != ''">
-                and target_user_ids like CONCAT('%,', #{userId},',%')
+                and FIND_IN_SET(#{userId},target_user_ids)
             </if>
             <if test="elevatorModel != null  and elevatorModel != ''">and elevator_model like CONCAT('%',
                 #{elevatorModel},'%')