From a81fe11a3e47c210a49c84eb8ff8313fb8f31194 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 30 Jun 2022 14:39:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=B1=85=E6=B0=91=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=97=B6bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dao/IcResiUserDao.java | 17 +++++++++-------- .../impl/IcResiUserImportServiceImpl.java | 10 +++++----- .../src/main/resources/mapper/IcResiUserDao.xml | 3 ++- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java index 9babaf57fc..0a83b820c1 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java @@ -262,7 +262,7 @@ public interface IcResiUserDao extends BaseDao { Map getCategoryListMap(@Param("columns") List columns, @Param("icUserId") String icUserId); - Map selectResiInfoMap(@Param("idCard") String idCard, @Param("resiId") String resiId); + Map selectResiInfoMap(@Param("customerId") String customerId, @Param("idCard") String idCard, @Param("resiId") String resiId); List> selectResiUsers(@Param("types") List types, @Param("orgId") String orgId); @@ -394,18 +394,19 @@ public interface IcResiUserDao extends BaseDao { @Param("customerId") String customerId); /** - * @describe: 通过身份证号查询实体类 - * @author wangtong - * @date 2022/6/13 17:32 - * @params [idCard, customerId] - * @return com.epmet.entity.IcResiUserEntity - */ - IcResiUserEntity selectResiUserEntityByIdCard(@Param("idCard") String idCard,@Param("customerId") String customerId); + * @return com.epmet.entity.IcResiUserEntity + * @describe: 通过身份证号查询实体类 + * @author wangtong + * @date 2022/6/13 17:32 + * @params [idCard, customerId] + */ + IcResiUserEntity selectResiUserEntityByIdCard(@Param("idCard") String idCard, @Param("customerId") String customerId); List getListIcResiUserDTO(@Param("icResiUserIdList") List icResiUserIdList); /** * desc:获取客户内 每个房屋内的居民数 + * * @param customerId * @return */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java index fc0b35888e..fce74a839e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java @@ -462,7 +462,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res //默认新增 columnAndValues.put("SUB_STATUS", IcResiUserSubStatusEnum.IMPORT.getSubStatus()); String idCard = columnAndValues.get("ID_CARD"); - Map existingResiMap = icResiUserDao.selectResiInfoMap(idCard, null); + Map existingResiMap = icResiUserDao.selectResiInfoMap(customerId, idCard, null); if (existingResiMap == null) { // 新导入的居民，因为还没有读取子sheet，所以这些居民类别没有办法获取，先默认设置成0，后面读取子sheet的时候再更新 @@ -705,7 +705,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res } // 检查用户是否存在 - Map existResiInfoMap = icResiUserDao.selectResiInfoMap(idCard, null); + Map existResiInfoMap = icResiUserDao.selectResiInfoMap(loginUserCustomerId, idCard, null); if (existResiInfoMap == null || existResiInfoMap.size() == 0) { throw new RenException(EpmetErrorCode.RESI_NOT_FOUND.getCode(), String.format("身份证号为【%s】的居民信息未找到，请确认该居民信息存在", idCard)); @@ -790,7 +790,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res "身份证号未填写"); } - Map resiInfoMap = icResiUserDao.selectResiInfoMap(idCard, null); + Map resiInfoMap = icResiUserDao.selectResiInfoMap(customerId, idCard, null); if (resiInfoMap == null || resiInfoMap.size() == 0) { throw new RenException(EpmetErrorCode.RESI_NOT_FOUND.getCode(), String.format("身份证号为【%s】的居民信息未找到，请确认该居民信息存在", idCard)); @@ -1654,7 +1654,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res Map oldCategories = oldData.getCategories(); Map newCategories = newData.getCategories(); - Map resiInfoMap = icResiUserDao.selectResiInfoMap(null, resiId); + Map resiInfoMap = icResiUserDao.selectResiInfoMap(customerId, null, resiId); fillResiSubCategoryInfo4TransferAndCategoryChange(oldData, newData, resiInfoMap); @@ -1785,7 +1785,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res for (Map.Entry resi : transferedResis.entrySet()) { String resiId = resi.getKey(); - Map resiInfoMap = icResiUserDao.selectResiInfoMap(null, resiId); + Map resiInfoMap = icResiUserDao.selectResiInfoMap(customerId, null, resiId); String resiName = resiInfoMap.get("NAME"); String pids = resiInfoMap.get("PIDS"); diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index 711505d7ea..b693502628 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -716,7 +716,8 @@