diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java index 5a9a9f3..01955ab 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java @@ -56,7 +56,6 @@ import com.elink.esua.epdc.vaccine.house.excel.BaseResidentInformationUpdateExce import com.elink.esua.epdc.vaccine.personroom.dao.EpidemicBuildingUnitDao; import com.elink.esua.epdc.vaccine.personroom.dao.EpidemicUnitOwnerDao; import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicBuildingUnitEntity; -import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicPlotBuildingEntity; import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicUnitOwnerEntity; import com.elink.esua.epdc.vaccine.personroom.redis.EpidemicBuildingUnitRedis; import com.elink.esua.epdc.vaccine.personroom.service.EpidemicBuildingUnitService; diff --git a/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicUnitOwnerDao.xml b/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicUnitOwnerDao.xml index 0a1b52a..a678125 100644 --- a/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicUnitOwnerDao.xml +++ b/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicUnitOwnerDao.xml @@ -113,10 +113,11 @@ select un.ROOM_CODE from epidemic_unit_owner ow - left join epidemic_building_unit un on ow.UNIT_ID = un.ID and un.DEL_FLAG = '0' + left join epidemic_building_unit un on ow.UNIT_ID = un.ID where ow.DEL_FLAG = '0' + and un.DEL_FLAG = '0' and ow.ID_CARD = #{idCard} - order by ow.CREATED_TIME + order by ow.CREATED_TIME DESC limit 1