diff --git a/src/components/CustomPages/BI/BI001HomeDetail.js b/src/components/CustomPages/BI/BI001HomeDetail.js
index a913609..5cbd6c8 100644
--- a/src/components/CustomPages/BI/BI001HomeDetail.js
+++ b/src/components/CustomPages/BI/BI001HomeDetail.js
@@ -217,9 +217,10 @@ class BI001HomeDetail extends React.Component {
   };
   //矿山
   chart1 = (mineType) => {
-    let json = initFilter(this.props.login.OrgId, mineType);
+    // let json = initFilter(this.props.login.OrgId, mineType);
     // extendRule(json, 'DEPARTMENT_NAME', 1, "矿山部");
     // extendOrder(json, "MONTH", 0);
+    let json = initFilter(this.props.login.OrgId);
     this.props.dispatch({
       type: "app/getDataByPost",
       url: "BI/BIStatiscialAnalysisController/GetClassCompletionSort",
diff --git a/src/components/CustomPages/BI/BI009FormRunAnalysis.js b/src/components/CustomPages/BI/BI009FormRunAnalysis.js
index 15c90f2..1ccc689 100644
--- a/src/components/CustomPages/BI/BI009FormRunAnalysis.js
+++ b/src/components/CustomPages/BI/BI009FormRunAnalysis.js
@@ -311,9 +311,18 @@ class BI009FormRunAnalysis extends React.Component {
 
   //获取数据
   getBaseInfoData = () => {
-    let json = initFilter(this.props.login.OrgId, "", "DEPARTMENT_NAME", "asc");
     let startTime = this.state.selectStartTime.format("YYYY-MM-DD 00:00:00");
     let endTime = this.state.selectEndTime.format("YYYY-MM-DD 23:59:59");
+    let json = initFilter(
+      this.props.login.OrgId,
+      "",
+      "DEPARTMENT_NAME",
+      "asc",
+      "",
+      "",
+      startTime,
+      endTime
+    );
     // 使用
     let span = this.getDiffDay(startTime, endTime);
     if (span <= 7) {
@@ -329,12 +338,13 @@ class BI009FormRunAnalysis extends React.Component {
     } else {
       extendRule(json, "FILTER_TIME", 1, 0);
     }
+    
     // extendRule(json, "DEPARTMENT_NAME", 2, "宁化行洛坑钨矿有限公司");
     // extendRule(json, "DEPARTMENT_NAME", 2, "都昌金鼎钨钼矿业有限公司");
     // extendRule(json, "DEPARTMENT_NAME", 2, "技术管理部");
     this.props.dispatch({
       type: "app/getDataByPost",
-      url: "BI/SafetaskFinish/OrderEntities",
+      url: "BI/BIStatiscialAnalysisController/GetSafeEntities",
       payload: json,
       onlyData: false,
       onComplete: (ret) => {
diff --git a/src/components/CustomPages/BI/BI012FormRunAnalysis.js b/src/components/CustomPages/BI/BI012FormRunAnalysis.js
index fcefa63..805f369 100644
--- a/src/components/CustomPages/BI/BI012FormRunAnalysis.js
+++ b/src/components/CustomPages/BI/BI012FormRunAnalysis.js
@@ -573,7 +573,7 @@ class BI012FormRunAnalysis extends React.Component {
             >
               <b>选择部门：</b>
               <DropDownPagination inputDataApi={'FM/Department/OrderPaged'} fieldName={'Nav_Department.NAME'}
-                    data={this.state.departData} onSelect={this.onSelectDepartment} onFilter={({ params }) => {
+                    data={this.state.departData} onSelect={this.onSelectDepartment} value = {this.props.login.user?.Nav_Department?.NAME} onFilter={({ params }) => {
                       params.OrderType = 1
                       params.OrgId = this.state.departData ? this.state.departData.ORG_ID : this.props.login.OrgId
                       // extendRule(params, 'DEPARTMENT_TYPE', 1, 0)
@@ -592,7 +592,7 @@ class BI012FormRunAnalysis extends React.Component {
               <Input
                 onChange={this.handleSearch}
                 style={{ width: "150px" }}
-                defaultValue={this.props.login.user.NAME}
+                defaultValue={this.props.login.user?.NAME}
               ></Input>
             </span>
             <span
@@ -777,7 +777,7 @@ class BI012FormRunAnalysis extends React.Component {
                 // scroll={{ y: 400 }}
                 dataSource={this.state.retData}
                 columns={this.state.detailcolumns}
-                pagination={true}
+                pagination={false}
                 loading={false}
                 size="small"
                 bordered
diff --git a/src/components/CustomPages/BI/BI064FormRunAnalysis.js b/src/components/CustomPages/BI/BI064FormRunAnalysis.js
index 5e6cf6a..edcef3d 100644
--- a/src/components/CustomPages/BI/BI064FormRunAnalysis.js
+++ b/src/components/CustomPages/BI/BI064FormRunAnalysis.js
@@ -612,6 +612,7 @@ getEndDate=()=>{
                   inputDataApi={'FM/Organization/OrderPaged'}
                   fieldName={'NAME'}
                   data={this.state.depart}
+                  value = {this.state.inputText}
                   onSelect={this.handleSearch}
                   onFilter={({ params }) => {
                     params.OrderType = 1;