Merge branch 'develop' of http://132.232.206.88:3000/lift-manager/lift-server into feature-bieao

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查询待维保数量

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/region/dao/mapper/RegionMapper.java

@@ -35,7 +35,7 @@ public interface RegionMapper extends BaseMapper<Region> {
     List<Map<String, Object>> selectAreaCodes();
 
     @Select("select user_id userId,name from user_info where user_id in (${userOrClerks})")
-    List<Map<String, Object>> selectRegionMember(String userOrClerks);
+    List<Map<String, Object>> selectRegionMember(@Param("userOrClerks") String userOrClerks);
 
     @Select("select name,code from area_code where parent=#{cityCode}")
     List<Map<String, Object>> areas(String cityCode);

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/region/service/impl/RegionServiceImpl.java

@@ -56,6 +56,7 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
             for (Map<String, Object> area : areaCodes) {
                 if (null != region.getProvinceCode() && region.getProvinceCode().equals(area.get("code"))) {
                     region.setProvinceName(area.get("name").toString());
+                    continue;
                 } else {
                     region.setProvinceName("无");
                 }
@@ -75,7 +76,7 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
                     if (project.get("regionId").equals(id)) {
                         projectNum += 1;
                         //如果项目电梯数量为null,就设置0
-                        num += null != project.get("num") ? (int) project.get("num") : 0;
+                        num += null != project.get("num") ? (long) project.get("num") : 0;
                     }
                 }
             }
@@ -108,6 +109,7 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
                 //如果区域的城市code等于区中的code，put名字到区域中
                 if (null != r.get("cityCode") && r.get("cityCode").equals(area.getCode())) {
                     r.put("city", area.getName());
+                    continue;
                 }
                 //如果区域的省code等于区中的code，put名字到区域中
                 if (null != r.get("provinceCode") && r.get("provinceCode").equals(area.getCode())) {
@@ -115,7 +117,7 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
                 }
             }
         }
-        return RestResponse.success(regions, "查询成功");
+        return RestResponse.success(regions);
     }
 
     //项目模块用，查询区域下的成员列表
@@ -140,7 +142,7 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
         } else {
             result.put("regionClerk", null);
         }
-        return RestResponse.success(result, "查询成功");
+        return RestResponse.success(result);
     }
 
     public List<Map<String, Object>> areas(String cityCode) {