Merge remote-tracking branch 'origin/master'

common/src/main/resources/mapper/ReportDataMapper.xml

@@ -21,7 +21,7 @@
         INNER JOIN OPERATION OP ON OP.SITE = ZT.SITE AND OP.OPERATION = ZT.OPERATION AND OP.CURRENT_REVISION = 'true'
         LEFT JOIN OPERATION_T OT ON OT.OPERATION_BO = OP.HANDLE AND OT.LOCALE = 'zh'
         INNER JOIN RESRCE RS ON RS.SITE = ZT.SITE AND RS.RESRCE = ZT.RESRCE
-        LEFT JOIN Z_NWA_USER ZNU ON ZNU.SITE = ZT.SITE AND ZNU.USER_NAME = ZT.CREATE_USER
+        LEFT JOIN Z_NWA_USER ZNU ON ZNU.USER_NAME = ZT.CREATE_USER
         WHERE ZT.SITE = #{site}
         <if test="workCenter != null and workCenter != ''" >
             AND WC.WORK_CENTER = #{workCenter}