Merge remote-tracking branch 'origin/dev'

5 years ago · d2a4c01555
2 changed files with 2 additions and 2 deletions
--- a/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/AreaCodeChildDao.xml
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/AreaCodeChildDao.xml
@ -5,7 +5,7 @@
    <select id="selectAllChild" resultType="com.epmet.dto.AreaCodeChildDTO">
-        select * from area_code_child
+        select * from area_code_child m where m.DEL_FLAG = '0'
    </select>
    <select id="selectByCode" resultType="com.epmet.dto.AreaCodeChildDTO">
--- a/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/AreaCodeDao.xml
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/AreaCodeDao.xml
@ -5,7 +5,7 @@
    <select id="selectAllArea" resultType="com.epmet.dto.AreaCodeDTO">
-        select * from area_code
+        select * from area_code m where m.DEL_FLAG = '0'
    </select>
    <select id="selectByCountyCode" resultType="com.epmet.dto.AreaCodeDTO">