Merge remote-tracking branch 'origin/dev/mix20191114_staticSearch' into dev/mix20191114_staticSearch

knowledgeman-service/src/main/resources/mapper/RelationMapper.xml

@@ -105,7 +105,7 @@
 		GROUP BY t2.id) tab
 		where 1=1
 		<if test="name!=null and name!=''">
-			and libName like concat('%',#{name},'%')
+			and UPPER(libName) like concat('%',UPPER(TRIM(#{name})),'%')
 		</if>
 		ORDER BY isDeleted ASC,operTime DESC
     </select>