Merge branch 'master' of http://121.42.41.42:7070/r/epmet-cloud into dev_tripreport

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}

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 != '' ">