diff --git a/src/components/CustomPages/SK/SK002CheckList.js b/src/components/CustomPages/SK/SK002CheckList.js
index cc218d0..3a839fe 100644
--- a/src/components/CustomPages/SK/SK002CheckList.js
+++ b/src/components/CustomPages/SK/SK002CheckList.js
@@ -13,6 +13,9 @@ class SK002CheckList extends React.Component {
     constructor(props) {
         super(props);
         this.state = {
+          inputText:"",
+          productionId:null,
+          depart: {},
           selectedRowKeys:[],
           taskSelects: [],
             dataList: [],
@@ -96,6 +99,7 @@ class SK002CheckList extends React.Component {
     loadData = () => {
         let json = initFilter(this.props.login.OrgId);
         extendInclude(json, 'Nav_Details');
+        extendInclude(json, 'Nav_ProductionUnit');
         extendInclude(json, 'Nav_Details.Nav_DetailContents.Nav_Contents');
         extendInclude(json, 'Nav_Details.Nav_DetailContents.Nav_DetailHiddens.Nav_Question');
         extendInclude(json, 'Nav_Details.Nav_DetailContents.Nav_DetailBasics.Nav_Law');
@@ -118,9 +122,9 @@ class SK002CheckList extends React.Component {
     loadData2()
     {
       let temp=this.state.data
-      if(this.state.inputText)
+      if(this.state.productionId)
       {
-        temp=temp.filter(t=>t.MineType ==this.state.inputText);
+        temp=temp.filter(t=>t.PRODUCTION_UNIT_ID ==this.state.productionId);
       }
       if(this.state.inputText2)
       {
@@ -176,11 +180,22 @@ class SK002CheckList extends React.Component {
           taskSelects:selectedRows
         });
       };
-      handleSearch=(value)=>{
+      // handleSearch=(value)=>{
+      //   this.setState({
+      //     inputText: value
+      //   })
+      // }
+       handleSearch = ({data, record}) => {
         this.setState({
-          inputText: value
+          depart: {
+            ...this.state.depart,
+            PRODUCTION_UNIT_ID: data[0],
+            Nav_ProductionUnit: { NAME: record?.NAME },
+          },
+          inputText: record?.NAME,
+          productionId: record?.ID 
         })
-      }
+      };
       handleSearch2=(e)=>{
         this.setState({
           inputText2: e.target.value
@@ -211,18 +226,12 @@ class SK002CheckList extends React.Component {
                   label={'生产单元'}
                   {...formItemLayout}
                 >
-                   <Select 
-                    style={{width:'180px'}}
-                    allowClear
-                    onChange={this.handleSearch}
-                    >
-                        <Option value="30">露天矿</Option>
-      <Option value="10">选矿厂</Option>
-      <Option value="20">尾矿库</Option>
-      <Option value="31">职能口</Option>
-      <Option value="32">非金属</Option>
-      <Option value="40">地下矿</Option>
-                    </Select>
+                   <DropDownPagination inputDataApi={'FM/UserProductionUnitSet/OrderPaged'} fieldName={'Nav_ProductionUnit.NAME'}
+                    data={this.state.depart} onSelect={this.handleSearch} onFilter={({ params }) => {
+                      params.OrderType = 1
+                    //   params.Keyword = this.state.inputText3
+                      params.OrgId =  this.props.login.OrgId
+                    }} />
                 </Form.Item>
            </Col>
           <Col span={5} style={{ marginLeft: "10px" }}> 
diff --git a/src/components/CustomPages/SK/SK004CheckListNew.js b/src/components/CustomPages/SK/SK004CheckListNew.js
index 0f02075..b76bc34 100644
--- a/src/components/CustomPages/SK/SK004CheckListNew.js
+++ b/src/components/CustomPages/SK/SK004CheckListNew.js
@@ -79,8 +79,8 @@ class SK004CheckListNew extends React.Component {
               },
               {
                 title: "生产单元",
-                dataIndex: "Nav_ProductionUnit.NAME",
-                key: "Nav_ProductionUnit.NAME",
+                dataIndex: "MineType",
+                key: "MineType",
               },
               {
                 title: "检查层级",
diff --git a/src/files/edit/SK002.js b/src/files/edit/SK002.js
index 608761f..a45315f 100644
--- a/src/files/edit/SK002.js
+++ b/src/files/edit/SK002.js
@@ -27,19 +27,19 @@ export default {
      let code = getFieldValue('EVALUATE_LEVEL')  
      if(code === 10)
      {
-         setFieldValue("DEPARTMENT_TYPE", "_0_1_2_3_");
+         setFieldValue("DEPARTMENT_TYPE", "_5_10_15_20_");
      }
      if(code === 20)
      {
-         setFieldValue("DEPARTMENT_TYPE", "_0_1_2_");
+         setFieldValue("DEPARTMENT_TYPE", "_10_15_20_");
      }
      if(code === 30)
      {
-         setFieldValue("DEPARTMENT_TYPE", "_1_2_");
+         setFieldValue("DEPARTMENT_TYPE", "_15_20_");
      }
      if(code === 40)
      {
-         setFieldValue("DEPARTMENT_TYPE", "_2_");
+         setFieldValue("DEPARTMENT_TYPE", "_20_");
      }
     }
     if (colInfo.FIELD_NAME === 'Nav_SCOREL.SCORE' || colInfo.FIELD_NAME === 'Nav_SCOREE.SCORE' ||colInfo.FIELD_NAME === 'Nav_SCOREC.SCORE')
@@ -51,7 +51,7 @@ export default {
     {
       stateData.EVALUATE_SCORE=0;
       stateData.EVALUATE_LEVEL=40;
-      stateData.DEPARTMENT_TYPE="_2_";
+      stateData.DEPARTMENT_TYPE="_20_";
       // setFieldValue("EVALUATE_SCORE", 0);
       // setFieldValue("EVALUATE_LEVEL", 40);
       // setFieldValue("DEPARTMENT_TYPE", "_2_");
@@ -63,27 +63,27 @@ export default {
       if(score > 320)
       {
         stateData.EVALUATE_LEVEL=10;
-        stateData.DEPARTMENT_TYPE="_0_1_2_3_";
+        stateData.DEPARTMENT_TYPE="_5_10_15_20_";
         // setFieldValue("EVALUATE_LEVEL", "10");
         // setFieldValue("DEPARTMENT_TYPE", "_0_1_2_3_");
       }
       else if(score >= 160 &&score < 320)
       {
         stateData.EVALUATE_LEVEL=20;
-        stateData.DEPARTMENT_TYPE="_0_1_2_";
+        stateData.DEPARTMENT_TYPE="_10_15_20_";
         // setFieldValue("EVALUATE_LEVEL", 20);
         // setFieldValue("DEPARTMENT_TYPE", "_0_1_2_");
       }
       else if(score >= 70 &&score < 160)
       {
         stateData.EVALUATE_LEVEL=30;
-        stateData.DEPARTMENT_TYPE="_1_2_";
+        stateData.DEPARTMENT_TYPE="_15_20_";
         // setFieldValue("EVALUATE_LEVEL", 30);
         // setFieldValue("DEPARTMENT_TYPE", "_1_2_");
       }
       else{
         stateData.EVALUATE_LEVEL=40;
-        stateData.DEPARTMENT_TYPE="_2_";
+        stateData.DEPARTMENT_TYPE="_20_";
         // setFieldValue("EVALUATE_LEVEL", 40);
         // setFieldValue("DEPARTMENT_TYPE", "_2_");
       }
diff --git a/src/files/edit/SK004.js b/src/files/edit/SK004.js
index bafcc22..f55e92f 100644
--- a/src/files/edit/SK004.js
+++ b/src/files/edit/SK004.js
@@ -48,7 +48,7 @@ export default {
     
     if(stateData)
     {
-    if(!stateData.MineType)
+    if(!stateData.PRODUCTION_UNIT_ID || stateData.PRODUCTION_UNIT_ID === null)
     {
         message.error("请先选择生产单元！");
         return;
@@ -58,7 +58,7 @@ export default {
         message.error("请先选择辨识区域！");
         return;
     }
-    if(!stateData.RISK_NAME || stateData.RISK_NAME === null)
+    if(!stateData.RISK_NAME || stateData.RISK_NAME === null || stateData.RISK_NAME === '')
     {
         message.error("请先填写风险名称！");
         return;
@@ -69,13 +69,14 @@ export default {
     //     return;
     // }
     
-    if (stateData.AREA_ID && stateData.AREA_ID !== null && stateData.RISK_NAME && stateData.RISK_NAME !== null && stateData.MineType)
+    if (stateData.AREA_ID && stateData.AREA_ID !== null && stateData.RISK_NAME && stateData.RISK_NAME !== null&& stateData.RISK_NAME !== '' && stateData.PRODUCTION_UNIT_ID&& stateData.PRODUCTION_UNIT_ID!== null)
     {
       let json = initFilter(login.OrgId);
       // extendRule(json, 'TYPE_ID', 1, stateData.TYPE_ID);
       extendRule(json, 'AREA_ID', 1, stateData.AREA_ID);
       extendRule(json, 'RISK_NAME', 1, stateData.RISK_NAME);
-      extendRule(json, 'MineType', 1, stateData.MineType);
+      extendRule(json, 'PRODUCTION_UNIT_ID', 1, stateData.PRODUCTION_UNIT_ID);
+      extendInclude(json, 'Nav_ProductionUnit');
       extendInclude(json, 'Nav_Posts');
       extendInclude(json, 'Nav_Posts.Nav_PostDetails.Nav_Post');
       extendInclude(json, 'Nav_Departs');
@@ -285,19 +286,19 @@ export default {
      let code = getFieldValue('EVALUATE_LEVEL')  
      if(code === 10)
      {
-         setFieldValue("DEPARTMENT_TYPE", "_0_1_2_3_");
+         setFieldValue("DEPARTMENT_TYPE", "_5_10_15_20_");
      }
      if(code === 20)
      {
-         setFieldValue("DEPARTMENT_TYPE", "_0_1_2_");
+         setFieldValue("DEPARTMENT_TYPE", "_10_15_20_");
      }
      if(code === 30)
      {
-         setFieldValue("DEPARTMENT_TYPE", "_1_2_");
+         setFieldValue("DEPARTMENT_TYPE", "_15_20_");
      }
      if(code === 40)
      {
-         setFieldValue("DEPARTMENT_TYPE", "_2_");
+         setFieldValue("DEPARTMENT_TYPE", "_20_");
      }
     }
     if (colInfo.FIELD_NAME === 'Nav_SCOREL.SCORE' || colInfo.FIELD_NAME === 'Nav_SCOREE.SCORE' ||colInfo.FIELD_NAME === 'Nav_SCOREC.SCORE')
@@ -310,9 +311,9 @@ export default {
     {
       stateData.EVALUATE_SCORE=0;
       stateData.EVALUATE_LEVEL=40;
-      stateData.DEPARTMENT_TYPE="_2_";
+      stateData.DEPARTMENT_TYPE="_20_";
       let temp={
-        DEPARTMENT_TYPE:2,
+        DEPARTMENT_TYPE:20,
       }
       departs.push(temp);
     }
@@ -322,18 +323,18 @@ export default {
       if(score > 320)
       {
         stateData.EVALUATE_LEVEL=10;
-        stateData.DEPARTMENT_TYPE="_0_1_2_3_";
+        stateData.DEPARTMENT_TYPE="_5_10_15_20_";
         let temp3={
-          DEPARTMENT_TYPE:3,
+          DEPARTMENT_TYPE:5,
         }
         let temp={
-          DEPARTMENT_TYPE:0,
+          DEPARTMENT_TYPE:10,
         }
         let temp1={
-          DEPARTMENT_TYPE:1,
+          DEPARTMENT_TYPE:15,
         }
         let temp2={
-          DEPARTMENT_TYPE:2,
+          DEPARTMENT_TYPE:20,
         }
         departs.push(temp3);
         departs.push(temp);
@@ -345,17 +346,17 @@ export default {
       else if(score >= 160 &&score < 320)
       {
         stateData.EVALUATE_LEVEL=20;
-        stateData.DEPARTMENT_TYPE="_0_1_2_";
+        stateData.DEPARTMENT_TYPE="_10_15_20_";
         // setFieldValue("EVALUATE_LEVEL", 20);
         // setFieldValue("DEPARTMENT_TYPE", "_0_1_2_");
         let temp={
-          DEPARTMENT_TYPE:0,
+          DEPARTMENT_TYPE:10,
         }
         let temp1={
-          DEPARTMENT_TYPE:1,
+          DEPARTMENT_TYPE:15,
         }
         let temp2={
-          DEPARTMENT_TYPE:2,
+          DEPARTMENT_TYPE:20,
         }
         departs.push(temp);
         departs.push(temp1);
@@ -364,29 +365,29 @@ export default {
       else if(score >= 70 &&score < 160)
       {
         stateData.EVALUATE_LEVEL=30;
-        stateData.DEPARTMENT_TYPE="_1_2_";
+        stateData.DEPARTMENT_TYPE="_15_20_";
         // setFieldValue("EVALUATE_LEVEL", 30);
         // setFieldValue("DEPARTMENT_TYPE", "_1_2_");
         let temp1={
-          DEPARTMENT_TYPE:1,
+          DEPARTMENT_TYPE:15,
         }
         let temp2={
-          DEPARTMENT_TYPE:2,
+          DEPARTMENT_TYPE:20,
         }
         departs.push(temp1);
         departs.push(temp2);
       }
       else{
         stateData.EVALUATE_LEVEL=40;
-        stateData.DEPARTMENT_TYPE="_2_";
+        stateData.DEPARTMENT_TYPE="_20_";
         // setFieldValue("EVALUATE_LEVEL", 40);
         // setFieldValue("DEPARTMENT_TYPE", "_2_");
         let temp={
-          DEPARTMENT_TYPE:2,
+          DEPARTMENT_TYPE:20,
         }
         departs.push(temp);
       }
-      stateData.Nav_Departs = departs
+      // stateData.Nav_Departs = departs
       setFieldValue("EVALUATE_SCORE", score);
       // stateData.EVALUATE_SCORE=code1 *code2*code3;
     }
@@ -516,6 +517,8 @@ export default {
     if(login.tempAddData)
      {
       stateData.MineType = login.tempAddData.MineType
+      stateData.PRODUCTION_UNIT_ID = login.tempAddData.PRODUCTION_UNIT_ID
+      stateData.Nav_ProductionUnit = login.tempAddData.Nav_ProductionUnit
       stateData.RISK_NAME = login.tempAddData.RISK_NAME
       stateData.RISK_DESCRIPTION = login.tempAddData.RISK_DESCRIPTION
       stateData.TYPE_ID = login.tempAddData.TYPE_ID
@@ -599,13 +602,14 @@ export default {
       if(login.tempAddData.Nav_Details)
       {
         let details=[]
-        login.tempAddData.Nav_Details.map((item,k)=>{
+        login.tempAddData.Nav_Details.sort((m, n) => (m.NUM > n.NUM ? 1 : -1)).map((item,k)=>{
         let contents=[]
-        item.Nav_DetailContents && item.Nav_DetailContents.map((x,j)=>{
+        item.Nav_DetailContents && item.Nav_DetailContents.sort((m, n) => (m.NUM > n.NUM ? 1 : -1)).map((x,j)=>{
           let hiddens=[]
-          x.Nav_DetailHiddens && x.Nav_DetailHiddens.map((y,i)=>{
+          x.Nav_DetailHiddens && x.Nav_DetailHiddens.sort((m, n) => (m.NUM > n.NUM ? 1 : -1)).map((y,i)=>{
             let hidden={
               ID: guid(),
+              NUM:y.NUM,
               RECTIFICATION_MEASURES :y.RECTIFICATION_MEASURES,
               HIDDEN_LEVEL :y.HIDDEN_LEVEL,
               HIDDEN_DESCRIPTION :y.HIDDEN_DESCRIPTION,
@@ -625,6 +629,7 @@ export default {
           })
           let content={
             ID: guid(),
+            NUM:x.NUM,
             CHECK_STANDARD :x.CHECK_STANDARD,
             CHECK_CONTENTS_ID:x.CHECK_CONTENTS_ID,
             Nav_Contents:x.Nav_Contents,
@@ -635,6 +640,7 @@ export default {
         })
         let detail={
           ID: guid(),
+          NUM:item.NUM,
           MEASURES_NAME:item.MEASURES_NAME,
           Nav_DetailContents:contents
         }