From e84ea6189827bff9c9b589fe90c30971ffe93a27 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 14 Dec 2021 16:47:18 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dataaggre/dao/epmetuser/UserBaseInfoDao.java | 2 +- .../epmet/dataaggre/service/epmetuser/EpmetUserService.java | 2 +- .../service/epmetuser/impl/EpmetUserServiceImpl.java | 4 ++-- .../service/govproject/impl/GovProjectServiceImpl.java | 2 +- .../src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml | 1 + 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/UserBaseInfoDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/UserBaseInfoDao.java index 0ac5f211fc..e79c563c0a 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/UserBaseInfoDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/UserBaseInfoDao.java @@ -55,5 +55,5 @@ public interface UserBaseInfoDao extends BaseDao { * @Description 查询userId的身份证号在小程序用户中存在的多个userId值 * @author sun */ - List getUserBaseList(@Param("userId") String userId); + List getUserBaseList(@Param("userId") String userId, @Param("customerId") String customerId); } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java index 8b898f8765..6979f5d8b4 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java @@ -154,7 +154,7 @@ public interface EpmetUserService { * @Description 查询userId的身份证号在小程序用户中存在的多个userId值 * @author sun */ - List getUserBaseList(String userId); + List getUserBaseList(String userId, String customerId); /** * @Description 根据身份证号查询负能平台用户信息 diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java index ac6ee4a24e..181e037830 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java @@ -712,8 +712,8 @@ public class EpmetUserServiceImpl implements EpmetUserService { * @author sun */ @Override - public List getUserBaseList(String userId) { - return userBaseInfoDao.getUserBaseList(userId); + public List getUserBaseList(String userId, String customerId) { + return userBaseInfoDao.getUserBaseList(userId, customerId); } /** diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java index 7c821cffaa..dc84f51bdc 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java @@ -480,7 +480,7 @@ public class GovProjectServiceImpl implements GovProjectService { ProjectAnalysisResultDTO resultDTO = new ProjectAnalysisResultDTO(); resultDTO.setUserId(formDTO.getUserId()); //1.查询userId的身份证号在小程序用户中存在的多个userId值 - List userList = epmetUserService.getUserBaseList(formDTO.getUserId()); + List userList = epmetUserService.getUserBaseList(formDTO.getUserId(), formDTO.getCustomerId()); List userIds = userList.stream().map(UserBaseInfoDTO::getUserId).collect(Collectors.toList()); //2.查询对应负能平台用户家庭信息 diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml index 195e586292..6c118e2ce0 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml @@ -47,6 +47,7 @@ WHERE del_flag = '0' AND id_num = ( SELECT id_num FROM user_base_info WHERE user_id = #{userId}) + AND customer_id = #{customerId} \ No newline at end of file