Merge remote-tracking branch 'origin/master'

src/main/resources/mapper/ModelSubscribeMapper.xml

@@ -28,7 +28,7 @@
         left join
         ocp_model_base omb
         on omg.model_group_code = omb.model_group_code
-        <if test="_parameter != null and _parameter != '' ">
+        <if test="searchCondition != null and searchCondition != '' ">
             where
             model_name LIKE concat('%',#{searchCondition}::text ,'%')
         </if>
@@ -46,7 +46,7 @@
         where
         trim(org_level) != ''
         and
-        org_level::int4 &lt;= 4
+        org_level::int4 &lt;= 3
     </select>
 
 </mapper>
\ No newline at end of file