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..fb84d3d 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 @@ -28,6 +28,7 @@ import com.elink.esua.epdc.commons.tools.constant.StrConstant; import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.redis.RedisUtils; +import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.IdentityNoUtils; import com.elink.esua.epdc.commons.tools.utils.Result; @@ -127,6 +128,8 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl page(Map params) { + List deptIdList = SecurityUser.getUser().getDeptIdList(); + params.put("deptIdList",deptIdList); IPage page = getPage(params); List list = baseDao.getUnitPage(params); return new PageData<>(list, page.getTotal()); diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicPlotBuildingServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicPlotBuildingServiceImpl.java index 24e0f61..5f4eea9 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicPlotBuildingServiceImpl.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicPlotBuildingServiceImpl.java @@ -30,6 +30,7 @@ import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.redis.RedisKeys; import com.elink.esua.epdc.commons.tools.redis.RedisUtils; +import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; import com.elink.esua.epdc.commons.tools.utils.*; import com.elink.esua.epdc.dto.AllDeptDTO; import com.elink.esua.epdc.dto.SysSimpleDictDTO; @@ -95,6 +96,8 @@ public class EpidemicPlotBuildingServiceImpl extends CrudServiceImpl page(Map params) { + List deptIdList = SecurityUser.getUser().getDeptIdList(); + params.put("deptIdList",deptIdList); IPage page = getPage(params); List list = baseDao.getBuildingPage(params); return new PageData<>(list, page.getTotal()); @@ -102,6 +105,8 @@ public class EpidemicPlotBuildingServiceImpl extends CrudServiceImpl list(Map params) { + List deptIdList = SecurityUser.getUser().getDeptIdList(); + params.put("deptIdList",deptIdList); return baseDao.getBuildingPage(params); } diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicPlotCoordinateServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicPlotCoordinateServiceImpl.java index 78bbc9f..ba2672e 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicPlotCoordinateServiceImpl.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicPlotCoordinateServiceImpl.java @@ -96,6 +96,8 @@ public class EpidemicPlotCoordinateServiceImpl extends CrudServiceImpl page(Map params) { + List deptIdList = SecurityUser.getUser().getDeptIdList(); + params.put("deptIdList",deptIdList); IPage page = getPage(params); List list = baseDao.getPlotPage(params); list.forEach(item -> { diff --git a/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicBuildingUnitDao.xml b/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicBuildingUnitDao.xml index ae0fbb6..f2c2677 100644 --- a/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicBuildingUnitDao.xml +++ b/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicBuildingUnitDao.xml @@ -93,6 +93,12 @@ AND o.MOBILE = #{mobile} + + and u.GRID_ID in + + #{id} + + ORDER BY u.CREATED_TIME DESC diff --git a/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicPlotBuildingDao.xml b/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicPlotBuildingDao.xml index c7113bc..3aa056d 100644 --- a/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicPlotBuildingDao.xml +++ b/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicPlotBuildingDao.xml @@ -124,6 +124,12 @@ AND b.BUILDING_CODE LIKE '%${buildingCode}%' + + and b.GRID_ID in + + #{id} + + ORDER BY b.CREATED_TIME DESC