Merge remote-tracking branch 'origin/dev' into dev

src/main/resources/mapper/oa/NewsRelationMapper.xml

@@ -32,7 +32,7 @@
              WHERE t.delete_mark = 0 AND t4.id = 3
                AND t5.archives_status = 'FB2901')
     </insert>
-    <insert id="insertAllStudentStaff" parameterType="java.lang.Long">
+    <insert id="insertAllParentsStaff" parameterType="java.lang.Long">
         insert into xjr_oa_news_relation (id, news_id, user_id, create_date, read_mark)
             (select
                  UUID(),

src/main/resources/mapper/oa/OfficialDocumentReceivedHandleMapper.xml

@@ -13,7 +13,7 @@
         ),',', '>') AS receive_user_names,t1.is_handle,t4.name as handle_user_name,t1.handle_time,
         IFNULL((
         SELECT is_transfer FROM official_document_received_handle WHERE official_document_received_id = t1.id
-        AND create_user_id = 14954825256773
+        AND create_user_id = #{dto.loginUserId}
         ), 0) AS is_transfer
         FROM official_document_received t1
         INNER JOIN xjr_workflow_form_relation t2 ON t1.id = CAST(t2.form_key_value AS SIGNED)