Browse Source

修复省市名,mapper参数映射。错误

wanghaicheng 5 years ago
parent
commit
023d46ebde

+ 1 - 1
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);

+ 4 - 2
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("无");
                 }
@@ -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) {