Merge remote-tracking branch 'origin/dev_epidemic_situation' into develop

epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/dao/AreaCodeDao.java

@@ -22,6 +22,7 @@ import com.epmet.dto.AreaCodeDTO;
 import com.epmet.dto.result.AreaCodeResultDTO;
 import com.epmet.entity.AreaCodeEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -44,11 +45,11 @@ public interface AreaCodeDao extends BaseDao<AreaCodeEntity> {
 
     List<AreaCodeResultDTO> selectProvince();
 
-    List<AreaCodeResultDTO> selectCity(String pCode);
+    List<AreaCodeResultDTO> selectCity(@Param("pCode")String pCode);
 
-    List<AreaCodeResultDTO> selectDistrict(String pCode);
+    List<AreaCodeResultDTO> selectDistrict(@Param("pCode")String pCode);
 
-    List<AreaCodeResultDTO> selectStreet(String pCode);
+    List<AreaCodeResultDTO> selectStreet(@Param("pCode")String pCode);
 
-    List<AreaCodeResultDTO> selectCommunity(String pCode);
+    List<AreaCodeResultDTO> selectCommunity(@Param("pCode")String pCode);
 }

epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java

@@ -711,6 +711,7 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
                 break;
             case AreaCodeConstant.COMMUNITY:
                 log.info("社区无下级");
+                list=null;
                 break;
             default:
                 log.warn("parentLevel错误："+formDTO.getParentLevel());

epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/AreaCodeDao.xml

@@ -42,7 +42,7 @@
             ac.province_code ASC
     </select>
 
-    <select id="selectCity" parameterType="java.lang.String" resultType="com.epmet.dto.result.AreaCodeResultDTO">
+    <select id="selectCity"  resultType="com.epmet.dto.result.AreaCodeResultDTO">
         SELECT DISTINCT
             ac.city_code AS areaCode,
             ac.city_name AS areaName,
@@ -58,7 +58,7 @@
         ORDER BY
             ac.city_code ASC
     </select>
-    <select id="selectDistrict" parameterType="java.lang.String" resultType="com.epmet.dto.result.AreaCodeResultDTO">
+    <select id="selectDistrict" resultType="com.epmet.dto.result.AreaCodeResultDTO">
             SELECT DISTINCT
                 ac.county_code AS areaCode,
                 ac.county_name AS areaName,
@@ -74,7 +74,7 @@
             ORDER BY
                 ac.county_code ASC
     </select>
-    <select id="selectStreet" parameterType="java.lang.String" resultType="com.epmet.dto.result.AreaCodeResultDTO">
+    <select id="selectStreet"  resultType="com.epmet.dto.result.AreaCodeResultDTO">
         SELECT
             ac.`code` AS areaCode,
             ac.`name` AS areaName,
@@ -91,7 +91,7 @@
         ORDER BY
             ac.`code` ASC
     </select>
-    <select id="selectCommunity" parameterType="java.lang.String" resultType="com.epmet.dto.result.AreaCodeResultDTO">
+    <select id="selectCommunity" resultType="com.epmet.dto.result.AreaCodeResultDTO">
         SELECT
             ac.`code` AS areaCode,
             ac.`name` AS areaName,