合并

CODE/smart-community/property-api/src/main/resources/mapper/TransactionReportMapper.xml

 <mapper namespace="com.community.huiju.dao.TransactionReportMapper">
 <select id="transactionReportList" resultType="com.community.huiju.model.TransactionReport">
         SELECT
-        rr.reason as reason,
-        u.user_name as reportUserName,
-        sro.description as description,
-        u.login_name as reportPhone,
+        rr.reason AS reason,
+        uv.user_name AS reportUserName,
+        sro.description AS description,
+        uv.login_name AS reportPhone,
         tr.create_date
         FROM
         tp_transaction_report tr
-        LEFT JOIN sys_report_reason rr ON	tr.report_reason_id = rr.id
-        LEFT JOIN ta_user u ON tr.reporter_id = u.id
-        LEFT JOIN ta_user_verify uv ON u.id = uv.user_id
-        LEFT JOIN ta_sys_role sro ON uv.role_id = sro.id
+        LEFT JOIN sys_report_reason rr ON tr.report_reason_id = rr.id
+        LEFT JOIN ta_user_verify u ON tr.reporter_id = u.id
+        LEFT JOIN ta_user uv ON u.user_id = uv.id
+        LEFT JOIN ta_sys_role sro ON u.role_id = sro.id
         <where>
             tr.transaction_id=#{transactionId}
         <if test="reportPhone != null and reportPhone != ''">