diff --git a/src/components/CustomPages/SE/SE005ReportEdit.js b/src/components/CustomPages/SE/SE005ReportEdit.js
index ad346f2..6128f95 100644
--- a/src/components/CustomPages/SE/SE005ReportEdit.js
+++ b/src/components/CustomPages/SE/SE005ReportEdit.js
@@ -1,9 +1,9 @@
 import { message } from "antd/lib/index";
-import {Button, Popconfirm, Row, Col,Checkbox,Radio, Form, Input, Select, Table,Upload, Icon, PageHeader,Modal,Spin } from 'antd';
+import { Button, Popconfirm, Row, Col, Checkbox, Radio, Form, Input, Select, Table, Upload, Icon, PageHeader, Modal, Spin } from 'antd';
 import React from 'react';
 import { initFilter, extendRule, extendInclude, setDataFieldValue, guid, initQueryFilter } from "../../../utils/common";
 import ReactToPrint from "react-to-print";
-import styles from  '../../CustomPages/HI/StepForm.css';
+import styles from '../../CustomPages/HI/StepForm.css';
 import XLSX from 'xlsx';
 import { connect } from 'dva';
 import moment from 'moment';
@@ -32,9 +32,9 @@ class SE005ReportEdit extends React.Component {
         };
     };
     componentDidMount() {
-        if (this.state.ALL){
+        if (this.state.ALL) {
             this.loadList();
-        }else{
+        } else {
             this.loadData();
         }
     }
@@ -45,21 +45,21 @@ class SE005ReportEdit extends React.Component {
     loadList = () => {
         let json = initFilter(this.props.login.OrgId);
         json.OrgType = 2;
-        this.setState({loading: true})
+        this.setState({ loading: true })
         this.props.dispatch({
             type: 'app/getDataByPost',
             payload: json,
             url: 'SE/SESafeSurvey/GetReportList',
             onComplete: (ret) => {
-                this.setState({loading: false})
+                this.setState({ loading: false })
                 if (!ret)
                     return;
-                if (ret.length == 0){
+                if (ret.length == 0) {
                     message.warn("当年未查到有效的公司调查问卷报表");
                     return;
                 }
                 let taskid = this.props.data.id;
-                if (!ret.find(it => it.Key === taskid)){
+                if (!ret.find(it => it.Key === taskid)) {
                     taskid = ret[0].Key;
                 }
 
@@ -67,25 +67,25 @@ class SE005ReportEdit extends React.Component {
                     list: ret,
                     taskid,
                 })
-                this.loadData(); 
+                this.loadData();
             }
         });
-        
+
     }
     loadData = () => {
         let json = initFilter(this.props.login.OrgId);
         json.OrgType = 2;
         json.Parameter3 = this.state.type;
-        if (this.state.ALL){
+        if (this.state.ALL) {
             if (!this.state.taskid)
                 return;
             json.Parameter2 = this.state.taskid;
-        }else{
+        } else {
             if (!this.state.surveyid)
                 return;
             json.Parameter1 = this.state.surveyid;
         }
-        this.setState( { 
+        this.setState({
             data: null,
             loading: true
         });
@@ -94,16 +94,16 @@ class SE005ReportEdit extends React.Component {
             payload: json,
             url: 'SE/SESafeSurvey/GetReport',
             onComplete: (ret) => {
-                this.setState({loading: false})
-                if (!ret){
+                this.setState({ loading: false })
+                if (!ret) {
                     return;
                 }
-                this.setState({data: ret})
+                this.setState({ data: ret })
             }
         });
     }
-    onApprove = ()=>{
-        const { ALL,data } = this.state;
+    onApprove = () => {
+        const { ALL, data } = this.state;
         let json = {
             Parameter1: data.SURVEY[0].ID,
             Parameter2: this.props.data.TaskID,
@@ -118,10 +118,10 @@ class SE005ReportEdit extends React.Component {
             }
         });
     }
-    fmtEnum(name,value){
+    fmtEnum(name, value) {
         const enums = this.props.app.enums;
         if (!enums || !enums[name]) return '';
-        return enums[name].enums[value] || ''; 
+        return enums[name].enums[value] || '';
     }
     onTableBtnExport() {
         let TableWrap = document.getElementById('tableId' + this.props.data.id);
@@ -131,13 +131,13 @@ class SE005ReportEdit extends React.Component {
         name += '.xlsx';
         XLSX.writeFile(wb, name)
     }
-    getJoinDepartment(depart){
+    getJoinDepartment(depart) {
         let arr = [];
-        for(let it of depart){
-            if (it.Nav_Department){
-                if (it.Nav_Department.NAME == "宁化行洛坑钨矿有限公司"){
+        for (let it of depart) {
+            if (it.Nav_Department) {
+                if (it.Nav_Department.NAME == "宁化行洛坑钨矿有限公司") {
                     arr.push("公司领导")
-                }else{
+                } else {
                     arr.push(it.Nav_Department.NAME)
                 }
             }
@@ -145,44 +145,44 @@ class SE005ReportEdit extends React.Component {
         return arr;
     }
     render() {
-        const { ALL,data,list,loading } = this.state;
+        const { ALL, data, list, loading } = this.state;
         const count = data && data.ROWS && data.ROWS.length > 0 && data.ROWS[0].length || 1;
         const SPAN = Math.floor(24 / count) || 1;
-        const TITLE_SPAN = Math.max(24 - count * SPAN,0) + SPAN;
+        const TITLE_SPAN = Math.max(24 - count * SPAN, 0) + SPAN;
         const canApprove = this.props.data.tableKey == "1"
         return <div>
             <div style={{ padding: '10px' }}>
-                
+
                 <ReactToPrint
                     trigger={() => <Button type={'primary'} icon={'printer'} >打印</Button>}
                     content={() => this.componentRef}
                 />
                 <Button style={{ marginLeft: '8px' }} onClick={() => this.onTableBtnExport()} icon="export" >导出</Button>
                 {
-                    ALL &&  
-                    <Select style={{ fontSize: 14, width: "100px",marginLeft: '8px' }}
+                    ALL &&
+                    <Select style={{ fontSize: 14, width: "100px", marginLeft: '8px' }}
                         showSearch
                         value={this.state.taskid}
                         onChange={val => {
-                            this.setState({taskid: val})
+                            this.setState({ taskid: val })
                             this.loadData();
-                        } }
+                        }}
                     >
                         {
-                            list && list.map( it => {
-                                    return <Option key={it.Key} value={it.Key}>{it.Value}</Option>
-                                } 
+                            list && list.map(it => {
+                                return <Option key={it.Key} value={it.Key}>{it.Value}</Option>
+                            }
                             )
                         }
                     </Select>
                 }
 
-                <Select style={{ fontSize: 14, width: "100px", marginLeft: '8px'  }}
+                <Select style={{ fontSize: 14, width: "100px", marginLeft: '8px' }}
                     value={this.state.type}
                     onChange={val => {
                         this.state.type = val;
                         this.loadData();
-                    } }
+                    }}
                 >
                     <Option value={"部门"}>{"部门"}</Option>
                     <Option value={"人员"}>{"人员"}</Option>
@@ -193,18 +193,18 @@ class SE005ReportEdit extends React.Component {
                 }
             </div>
             <div ref={el => (this.componentRef = el)} id={'tableId' + this.props.data.id} style={{ padding: '20px' }}>
-                <h1 style={{ textAlign: 'center'}}>{this.state.ALL ? '安全意识调查问卷公司报表' : '安全意识调查问卷部门报表'}</h1>
+                <h1 style={{ textAlign: 'center' }}>{this.state.ALL ? '安全意识调查问卷公司报表' : '安全意识调查问卷部门报表'}</h1>
                 <Spin spinning={this.state.loading}>
                     {
-                        data &&  <>
+                        data && <>
                             <table style={{ width: '100%', textAlign: 'center', borderTop: '1px solid #333', borderLeft: '1px solid #333' }} className={styles.PrintForm}>
                                 <tbody>
                                     {
-                                        data.SURVEY && data.SURVEY.map(SURVEY =>{
+                                        data.SURVEY && data.SURVEY.map(SURVEY => {
                                             return <>
                                                 <tr>
                                                     <td colSpan={4} rowSpan={1} className={styles.fontBold}>调查名称</td>
-                                                    <td colSpan={20} rowSpan={1}>{SURVEY.NAME }</td>
+                                                    <td colSpan={20} rowSpan={1}>{SURVEY.NAME}</td>
                                                 </tr>
                                                 <tr>
                                                     <td colSpan={3} rowSpan={1} className={styles.fontBold}>发起时间</td>
@@ -222,31 +222,31 @@ class SE005ReportEdit extends React.Component {
                                                 </tr>
                                                 <tr>
                                                     <td colSpan={4} rowSpan={1} className={styles.fontBold}>调查内容</td>
-                                                    <td colSpan={20} rowSpan={1}>{ SURVEY.Nav_Points && SURVEY.Nav_Points.map(it => it.Nav_Point.NAME).join('、')}</td>
+                                                    <td colSpan={20} rowSpan={1}>{SURVEY.Nav_Points && SURVEY.Nav_Points.map(it => it.Nav_Point.NAME).join('、')}</td>
                                                 </tr>
                                             </>
-                                        })   
+                                        })
                                     }
                                     <tr>
                                         <td colSpan={24} rowSpan={1} className={styles.fontBold}>答案正确率(百分比)</td>
                                     </tr>
                                     {
-                                        data.ROWS && data.ROWS.map((row,ridx) =>{
+                                        data.ROWS && data.ROWS.map((row, ridx) => {
                                             return <tr>
                                                 {
-                                                    row.map((col,cidx) =>{
+                                                    row.map((col, cidx) => {
                                                         return <td colSpan={cidx == 0 ? TITLE_SPAN : SPAN} rowSpan={1} className={ridx == 0 || cidx == 0 ? styles.fontBold : null}>{col}{ridx == 0 || cidx == 0 ? null : "%"}</td>
                                                     })
                                                 }
                                             </tr>
-                                        })  
+                                        })
                                     }
                                 </tbody>
                             </table>
                         </>
                     }
                     {
-                        !data && !loading && <div style={{ width: '100%', textAlign: 'center'}}> 暂未查到有效数据 </div>
+                        !data && !loading && <div style={{ width: '100%', textAlign: 'center' }}> 暂未查到有效数据 </div>
                     }
                 </Spin>
 
diff --git a/src/components/CustomPages/SE/SE007AllView.js b/src/components/CustomPages/SE/SE007AllView.js
index ef15fc9..de2e9d9 100644
--- a/src/components/CustomPages/SE/SE007AllView.js
+++ b/src/components/CustomPages/SE/SE007AllView.js
@@ -84,7 +84,7 @@ class SE007AllView extends React.Component {
                             report: 0,
                         })
                     }
-                    let name = it.Nav_User.Nav_Department.NAME;
+                    let name = it.Nav_User?.Nav_Department?.NAME;
                     if (name == '宁化行洛坑钨矿有限公司') {
                         name = '公司领导';
                     }
diff --git a/src/components/CustomPages/SE/SE062ShowPrint.js b/src/components/CustomPages/SE/SE062ShowPrint.js
index e807a7d..273551b 100644
--- a/src/components/CustomPages/SE/SE062ShowPrint.js
+++ b/src/components/CustomPages/SE/SE062ShowPrint.js
@@ -159,7 +159,8 @@ class SE062ShowPrint extends React.Component {
                             <Descriptions.Item label="部门">{data && data.Nav_Department ? data.Nav_Department.NAME : ''}</Descriptions.Item>
                             <Descriptions.Item label="岗位">{data && data.Nav_Post ? data.Nav_Post.NAME : ''}</Descriptions.Item>
                             <Descriptions.Item label="分数">{data ? data.SCORE : null}</Descriptions.Item>
-                            <Descriptions.Item label="考核结果">{data ? data.EXAMINATION_RESULTS == 1 ? "合格" : "不合格" : null}</Descriptions.Item>
+                            {/* <Descriptions.Item label="考核结果">{data ? data.EXAMINATION_RESULTS == 1 ? "合格" : "不合格" : null}</Descriptions.Item> */}
+                            <Descriptions.Item label="考核结果">{(data && data.EXAMINATION_RESULTS && data.SCORE) ? enums.SEExaminationResultsEnum.enums[data.EXAMINATION_RESULTS] : ""}</Descriptions.Item>
                             <Descriptions.Item label="培训形式">{data ? this.returnModel(data.Nav_NewUser.TRAIN_MODEL) : null}</Descriptions.Item>
                             <Descriptions.Item label="附件">{showFiles(data.Nav_Files, config.picServerHost, this)}</Descriptions.Item>
                         </Descriptions>
diff --git a/src/components/CustomPages/SE/SEConfigPage.js b/src/components/CustomPages/SE/SEConfigPage.js
index d7828c6..d0747ac 100644
--- a/src/components/CustomPages/SE/SEConfigPage.js
+++ b/src/components/CustomPages/SE/SEConfigPage.js
@@ -224,7 +224,7 @@ class SEConfigPage extends React.Component {
                                 value={data.SAFE_SERVEY_TRIGGER_TIME ? moment(data.SAFE_SERVEY_TRIGGER_TIME) : null}
                                 onChange={value => {
                                     let data = this.state.data;
-                                    data.SAFE_SERVEY_TRIGGER_TIME = value;
+                                    data.SAFE_SERVEY_TRIGGER_TIME = moment(value);
                                     this.setState(data)
                                 }}
                             />
diff --git a/src/files/edit/SE071.js b/src/files/edit/SE071.js
index 2b1f001..fdf3361 100644
--- a/src/files/edit/SE071.js
+++ b/src/files/edit/SE071.js
@@ -104,13 +104,21 @@ export default {
     if (totalCount < 2) {
       return
     }
+
+    var Department = {}
     for (var i = 1; i < totalCount; i++) {
       //本行数据 如果为空 取上一行的 DEPARTMENT_ID  Nav_Department
-      if (stateData.Nav_ListPlanDetail[i].DEPARTMENT_ID == null || stateData.Nav_ListPlanDetail[i].DEPARTMENT_ID == undefined) {
-        let iRow = { ...stateData.Nav_ListPlanDetail[i] };
-        iRow.DEPARTMENT_ID = stateData.Nav_ListPlanDetail[i - 1].DEPARTMENT_ID
-        iRow.Nav_Department = stateData.Nav_ListPlanDetail[i - 1].Nav_Department
-        saveRowRecord({ record: iRow, editCode: "T_SE_TRAIN_PLAN_DETAIL" })
+      if ((stateData.Nav_ListPlanDetail[i].DEPARTMENT_ID == null || stateData.Nav_ListPlanDetail[i].DEPARTMENT_ID == undefined) && stateData.Nav_ListPlanDetail[i - 1].DEPARTMENT_ID) {
+        Department = {
+          ID: stateData.Nav_ListPlanDetail[i - 1].DEPARTMENT_ID,
+          NAME: stateData.Nav_ListPlanDetail[i - 1].Nav_Department.NAME
+        }
+        if (Department.ID != null && Department.ID != undefined) {
+          let iRow = { ...stateData.Nav_ListPlanDetail[i] };
+          iRow.DEPARTMENT_ID = Department.ID
+          iRow.Nav_Department = Department
+          saveRowRecord({ record: iRow, editCode: "T_SE_TRAIN_PLAN_DETAIL" })
+        }
       }
     }
   },
@@ -118,9 +126,15 @@ export default {
   btnSyncListDep: ({ stateData, saveRowRecord }) => {
     var totalCount = stateData.Nav_ListPlanDetail.length
     var listDetailDepartment = []
+    var listDetailDepartmentPer = []
+    debugger
     for (var i = 0; i < totalCount; i++) {
-      if (stateData.Nav_ListPlanDetail[i].Nav_ListDetailDepartment != null && stateData.Nav_ListPlanDetail[i].Nav_ListDetailDepartment.length > 0) {
-        listDetailDepartment = stateData.Nav_ListPlanDetail[i].Nav_ListDetailDepartment //取被同步的数据  只要有数据就赋值
+      listDetailDepartmentPer = stateData.Nav_ListPlanDetail[i].Nav_ListDetailDepartment
+      if (listDetailDepartmentPer != null && listDetailDepartmentPer.length > 0) {
+        listDetailDepartmentPer = listDetailDepartmentPer.filter(e => e.IS_DELETED == null || !e.IS_DELETED)
+      }
+      if (listDetailDepartmentPer != null && listDetailDepartmentPer.length > 0) {
+        listDetailDepartment = listDetailDepartmentPer //取被同步的数据  只要有数据就赋值
       } else if (listDetailDepartment != null && listDetailDepartment.length > 0) {
         let updateList = [];
         for (let j = 0; j < listDetailDepartment.length; j++) {
diff --git a/src/utils/request.js b/src/utils/request.js
index e338579..4362256 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -66,6 +66,20 @@ export function getRequestHeaders(url, type = 'post', data, isIgnoreTenant) {
   }
   // 非 OP 路径接口，header 需要添加 Tenant
   const Tenant = storage('lacal').getItem('Tenant').val
+  //wyw 总部数据搜索 子公司切换处理
+  if (data && data.OrgId && data.OrgId === '00300000-0000-0000-0000-000000000000' && url && data.FilterGroup.
+    Groups && data.FilterGroup.Groups.length > 0 && (data.Parameter22 == null || data.Parameter22 === '')) {
+    data.FilterGroup.Groups.forEach(e => {
+      if (e.Rules && e.Rules.length > 0 && (data.Parameter22 == null || data.Parameter22 === '')) {
+        e.Rules.forEach(e => {
+          if (e.Field === "ORG_ID") {
+            data.Parameter22 = e.Value
+          }
+        })
+      }
+    });
+  }
+
   if (url.indexOf('PF/Login/Login') !== -1) {
     // Login接口使用最新的Tenant、Orgid、userid、Username值
     const latestTenant = storage('lacal').getItem('Tenant').val