Merge branch 'wanghaicheng' of lift-manager/lift-server into develop

lift-business-service/src/main/resources/application-prod.yml

@@ -40,6 +40,10 @@ spring:
   jms:
     #如果是点对点（queue），那么此处默认应该是false，如果发布订阅，那么一定设置为true
     pub-sub-domain: false
+  servlet:
+    multipart:
+      #配置文件接收大小最大为3MB
+      max-file-size: 3MB
 
 #aliyun OSS服务配置信息，加载到SystemConfiguration
 aliyun:

lift-common/src/main/java/cn.com.ty.lift.common/constants/SqlConstants.java

@@ -151,7 +151,7 @@ public interface SqlConstants {
                     "   from region r" +
                     "         left join user_info ui on r.user_id = ui.user_id" +
                     "     where mt_company_id = #{mtCompanyId}" +
-                    "       and (r.area_name like '%${name}%' or ui.name like '%${name}%')" +
+                    "       and r.area_name like '%${name}%' and ui.name like '%${name}%'" +
                     "   order by create_time desc";
 
     //根据用户id查询待维保数量