1. 转译组件针对null时的处理修复；2. 日报导出，按填报时的部门进行导出。

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ReportMapper.xml

@@ -82,7 +82,7 @@
         left join task_group on task_group.id = a.group_id
         left join user u on u.id = a.project_auditor_id
         left join user u2 on u2.id = b.incharger_id
-        left join department on department.department_id = c.department_id
+        left join department on department.department_id = a.dept_id
         left join department dp2 on dp2.department_id = b.bu_id
         left join project_main on b.project_main_id=project_main.id
         WHERE (<if test="stateKey == null or stateKey == 0">
@@ -139,7 +139,7 @@
         left join task_group on task_group.id = a.group_id
         left join user u on u.id = a.project_auditor_id
         left join user u2 on u2.id = b.incharger_id
-        left join department on department.department_id = c.department_id
+        left join department on department.department_id = a.dept_id
         left join department dp2 on dp2.department_id = b.bu_id
         left join project_main on b.project_main_id=project_main.id
         left join report_log_detail rlog on rlog.report_id = a.id
@@ -222,7 +222,7 @@
         left join task_group on task_group.id = a.group_id
         left join user u on u.id = a.project_auditor_id
         left join user u2 on u2.id = b.incharger_id
-        left join department on department.department_id = c.department_id
+        left join department on department.department_id = a.dept_id
         left join department dp2 on dp2.department_id = b.bu_id
         left join project_main on project_main.id=b.project_main_id
         WHERE
@@ -290,7 +290,7 @@
         left join task_group on task_group.id = a.group_id
         left join user u on u.id = a.project_auditor_id
         left join user u2 on u2.id = b.incharger_id
-        left join department on department.department_id = c.department_id
+        left join department on department.department_id = a.dept_id
         left join department dp2 on dp2.department_id = b.bu_id
         left join project_main on project_main.id=b.project_main_id
         left join report_log_detail rlog on rlog.report_id = a.id
@@ -353,7 +353,7 @@
         left join task_group on task_group.id = a.group_id
         left join user u on u.id = a.project_auditor_id
         left join user u2 on u2.id = b.incharger_id
-        left join department on department.department_id = c.department_id
+        left join department on department.department_id = a.dept_id
         left join department dp2 on dp2.department_id = b.bu_id
         left join project_main on project_main.id=b.project_main_id
         WHERE (

fhKeeper/formulahousekeeper/timesheet/src/components/translationOpenDataText.vue

@@ -1,10 +1,10 @@
 <template>
     <div class="translation">
         <!-- 文本 -->
-        <span v-if="corporateWeChat && !noRender.includes(openIdValue)">
+        <span v-if="corporateWeChat && openIdValue && !noRender.includes(openIdValue) ">
             <ww-open-data :type='type' :openid='openIdValue'></ww-open-data>
         </span>
-        <span v-else-if="dingdingPlatform && !noRender.includes(openIdValue)">
+        <span v-else-if="dingdingPlatform && openIdValue && !noRender.includes(openIdValue)">
             <dt-open-data :open-type='dingdingOpenType[type]' :open-id='openIdValue'></dt-open-data>
         </span>
         <span v-else>{{ openIdValue }}</span>