Merge remote-tracking branch 'origin/dev'

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml

@@ -129,8 +129,9 @@
         LEFT JOIN ic_neighbor_hood c on a.NEIGHBOR_HOOD_ID = c.ID and c.DEL_FLAG = '0'
         LEFT JOIN ic_building_unit d on a.BUILDING_UNIT_ID = d.ID and d.DEL_FLAG = '0'
         <where>
+                                            a.del_flag = '0'
             <if test="pids != null and pids != ''">
-                case c.AGENCY_PIDS
+            and    case c.AGENCY_PIDS
                     when '' then CONCAT(c.AGENCY_ID) like CONCAT(#{pids}, '%')
                     else CONCAT(c.AGENCY_PIDS, ':', c.AGENCY_ID) like CONCAT(#{pids}, '%')
                 end