diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/MapInfoFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/MapInfoFormDTO.java index d97acc0d24..662c4c459d 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/MapInfoFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/MapInfoFormDTO.java @@ -41,6 +41,11 @@ public class MapInfoFormDTO implements Serializable { */ private String name; + /** + * 客户ID + */ + private String customerId; + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointAppController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointAppController.java index babae7655b..b6f3edb0a7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointAppController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointAppController.java @@ -1,5 +1,7 @@ package com.epmet.controller; +import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.AddGroup; @@ -33,9 +35,10 @@ public class IcPointAppController { * @return */ @PostMapping("getMapInfoByPointType") - public Result> getMapInfoByPointType(@RequestBody MapInfoFormDTO formDTO){ + public Result> getMapInfoByPointType(@RequestBody MapInfoFormDTO formDTO, @LoginUser TokenDto tokenDto){ // 效验数据 ValidatorUtils.validateEntity(formDTO, AddGroup.class, DefaultGroup.class); + formDTO.setCustomerId(tokenDto.getCustomerId()); return icPointAppService.getMapInfoByPointType(formDTO); } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointNucleicMonitoringDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointNucleicMonitoringDao.xml index 859b70029b..f57e3129bd 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointNucleicMonitoringDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointNucleicMonitoringDao.xml @@ -127,6 +127,7 @@ LATITUDE from ic_point_nucleic_monitoring where DEL_FLAG = 0 + and CUSTOMER_ID = #{customerId} and NAME like CONCAT('%' ,#{name}, '%') diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointVaccinesInoculationDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointVaccinesInoculationDao.xml index e66c653325..1f96e06769 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointVaccinesInoculationDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcPointVaccinesInoculationDao.xml @@ -139,6 +139,7 @@ LATITUDE from ic_point_vaccines_inoculation where DEL_FLAG = 0 + and CUSTOMER_ID = #{customerId} and NAME like CONCAT('%' ,#{name}, '%')