From e76e075c9ce44e44721457cb3335245ff0efe775 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 27 Apr 2023 16:28:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=82=E5=8C=97=E5=8F=8D=E9=A6=88=E7=A4=BE?=
 =?UTF-8?q?=E5=8C=BA=E5=AE=89=E5=85=A8=E6=9C=8D=E5=8A=A1=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=B8=8D=E5=87=BA=E6=9D=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dao/IcResiUserDao.java          | 6 ++++++
 .../java/com/epmet/service/impl/IcResiUserServiceImpl.java  | 2 +-
 .../src/main/resources/mapper/IcResiUserDao.xml             | 4 ++++
 3 files changed, 11 insertions(+), 1 deletion(-)

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 dba99aadfa..31f4614347 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
@@ -464,4 +464,10 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
 
     List<IcResiUserDTO> getImportUserList(@Param("customerId")String customerId,@Param("agencyId")String agencyId);
 
+    /**
+     * 根据ic_resi_user.id查询，不限制任何状态
+     * @param icResiUserId
+     * @return
+     */
+    IcResiUserEntity getById(String icResiUserId);
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
index 6e7840084a..9a3863b42d 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
@@ -1716,7 +1716,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
 
     @Override
     public IcResiUserDTO get(String icResiUserId) {
-        IcResiUserEntity icResiUserEntity = baseDao.selectById(icResiUserId);
+        IcResiUserEntity icResiUserEntity =baseDao.getById(icResiUserId);
         return ConvertUtils.sourceToTarget(icResiUserEntity, IcResiUserDTO.class);
     }
 
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 118c0c3c36..950f135680 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
@@ -1527,4 +1527,8 @@
 
     </select>
 
+    <!-- 不限制任何状态   -->
+    <select id="getById" parameterType="java.lang.String" resultType="com.epmet.entity.IcResiUserEntity">
+        select r.*  from ic_resi_user r where r.id = #{icResiUserId}
+    </select>
 </mapper>