From 28787af7826610cc30009532c4b34e22f40a80b7 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Fri, 1 Jul 2022 11:19:00 +0800 Subject: [PATCH] =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E7=82=B9?= =?UTF-8?q?=EF=BC=8C=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B=E7=82=B9=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0customerId=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/form/MapInfoFormDTO.java | 5 +++++ .../main/java/com/epmet/controller/IcPointAppController.java | 5 ++++- .../main/resources/mapper/IcPointNucleicMonitoringDao.xml | 1 + .../main/resources/mapper/IcPointVaccinesInoculationDao.xml | 1 + 4 files changed, 11 insertions(+), 1 deletion(-) 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}, '%')