From 908f2a41f02c654da58f899cdd99e3ea54985ea6 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Fri, 4 Nov 2022 16:51:12 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=A2=E6=88=B7ID=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/IcBirthRecordDao.xml             | 3 +++
 .../src/main/resources/mapper/IcMoveInRecordDao.xml            | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcBirthRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcBirthRecordDao.xml
index 9f6ac1e550..b4b8b4894b 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcBirthRecordDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcBirthRecordDao.xml
@@ -68,6 +68,9 @@
             ibr.UPDATED_TIME
 		from ic_birth_record ibr
 		left join ic_resi_user iru on iru.ID_CARD = ibr.ID_CARD and iru.DEL_FLAG = 0
+        <if test='customerId != "" and customerId != null'>
+            and iru.CUSTOMER_ID=#{customerId}
+        </if>
 		where ibr.DEL_FLAG = 0
         <if test='customerId != "" and customerId != null'>
             AND ibr.CUSTOMER_ID = #{customerId}
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcMoveInRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcMoveInRecordDao.xml
index 03065d2e60..9aa41b001d 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcMoveInRecordDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcMoveInRecordDao.xml
@@ -30,7 +30,7 @@
             mir.householder_name householderName,
             mir.householder_relation householderRelation
         FROM ic_move_in_record mir
-        left join ic_resi_user iru on iru.ID_CARD = mir.ID_CARD and iru.DEL_FLAG = 0
+        left join ic_resi_user iru on iru.ID_CARD = mir.ID_CARD and iru.DEL_FLAG = 0 and iru.CUSTOMER_ID=#{customerId}
         WHERE  mir.del_flag = '0'
         AND mir.customer_id=#{customerId}
         <if test="gridId != null and gridId != '' ">

From a454096f6a4a51dbf05c3a25773f94e63bb43b45 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 4 Nov 2022 16:59:44 +0800
Subject: [PATCH 2/2] name

---
 .../src/main/resources/mapper/govorg/CustomerAgencyDao.xml      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml
index 90f40009c2..262b5435d9 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml
@@ -328,7 +328,7 @@
 
     <!-- 查询员工的证件号和手机号 -->
     <select id="getEmployeeRegisterMobileAndIdCard" resultType="java.util.Map">
-        select MOBILE,ID_CARD from ic_employee_register where id = #{registerId}
+        select MOBILE,ID_CARD,NAME from ic_employee_register where id = #{registerId}
     </select>
 
 </mapper>