diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusPipeline.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusPipeline.java
index e1bbce4..b988917 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusPipeline.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusPipeline.java
@@ -31,18 +31,21 @@
      * 管线编号
      */
     @TableField("pipeline_code")
+    @ExcelProperty("管线编号")
     private String pipelineCode;
 
     /**
      * 管线名称
      */
     @TableField("pipeline_name")
+    @ExcelProperty("管线名称")
     private String pipelineName;
 
     /**
      * 管线类型(下拉框）
      */
     @TableField("pipeline_type")
+    @ExcelProperty("管线类型")
     private String pipelineType;
 
     @TableField(exist = false)
@@ -52,33 +55,39 @@
      *  管径(mm)
      */
     @TableField("pipe_diameter")
+    @ExcelProperty("管径(mm)")
     private String pipeDiameter;
     /**
      * 材质
      */
     @TableField("material")
+    @ExcelProperty("材质")
     private String material;
 
     /**
      * 埋设方式
      */
     @TableField("bury_mode")
+    @ExcelProperty("埋设方式")
     private String buryMode;
     /**
      * 管线位置
      */
     @TableField("pipeline_position")
+    @ExcelProperty("管线位置")
     private String pipelinePosition;
     /**
      * 建设年代
      */
     @TableField("construct_era")
+    @ExcelProperty("建设年代")
     private String constructEra;
 
     /**
      * 权属单位(下拉框)
      */
     @TableField("deptid")
+    @ExcelProperty("权属单位代码")
     private Long deptid;
 
     /**
@@ -90,47 +99,55 @@
      * 起始地面高(mm)
      */
     @TableField("start_ground_height")
+    @ExcelProperty("起始地面高(mm)")
     private Float startGroundHeight;
 
     /**
      * 起始埋深(m)
      */
     @TableField("start_bury_deep")
+    @ExcelProperty("起始埋深(m)")
     private Float startBuryDeep;
 
     /**
      * 起始管顶高(mm)
      */
     @TableField("start_pipecrown_height")
+    @ExcelProperty("起始管顶高(mm)")
     private Float startPipecrownHeight;
     /**
      * 终止地面高(mm)
      */
     @TableField("end_ground_height")
+    @ExcelProperty("终止地面高(mm)")
     private Float endGroundHeight;
 
     /**
      * 终止埋深(m)
      */
     @TableField("end_bury_deep")
+    @ExcelProperty("终止埋深(m)")
     private Float endBuryDeep;
 
     /**
      * 终止管顶高(mm)
      */
     @TableField("end_pipecrown_height")
+    @ExcelProperty("终止管顶高(mm)")
     private Float endPipecrownHeight;
 
     /**
      * 设计压力(MPa)
      */
     @TableField("design_pressure")
-    private String designPressure;
+    @ExcelProperty("设计压力(Mpa)")
+    private Float designPressure;
 
     /**
      * 瞬时流量(m³)
      */
     @TableField("instantaneous_flow")
+    @ExcelProperty("瞬时流量(m³)")
     private Float instantaneousFlow;
 
     /*

diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusPipeline.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusPipeline.java
index e1bbce4..b988917 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusPipeline.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusPipeline.java
@@ -31,18 +31,21 @@
      * 管线编号
      */
     @TableField("pipeline_code")
+    @ExcelProperty("管线编号")
     private String pipelineCode;
 
     /**
      * 管线名称
      */
     @TableField("pipeline_name")
+    @ExcelProperty("管线名称")
     private String pipelineName;
 
     /**
      * 管线类型(下拉框）
      */
     @TableField("pipeline_type")
+    @ExcelProperty("管线类型")
     private String pipelineType;
 
     @TableField(exist = false)
@@ -52,33 +55,39 @@
      *  管径(mm)
      */
     @TableField("pipe_diameter")
+    @ExcelProperty("管径(mm)")
     private String pipeDiameter;
     /**
      * 材质
      */
     @TableField("material")
+    @ExcelProperty("材质")
     private String material;
 
     /**
      * 埋设方式
      */
     @TableField("bury_mode")
+    @ExcelProperty("埋设方式")
     private String buryMode;
     /**
      * 管线位置
      */
     @TableField("pipeline_position")
+    @ExcelProperty("管线位置")
     private String pipelinePosition;
     /**
      * 建设年代
      */
     @TableField("construct_era")
+    @ExcelProperty("建设年代")
     private String constructEra;
 
     /**
      * 权属单位(下拉框)
      */
     @TableField("deptid")
+    @ExcelProperty("权属单位代码")
     private Long deptid;
 
     /**
@@ -90,47 +99,55 @@
      * 起始地面高(mm)
      */
     @TableField("start_ground_height")
+    @ExcelProperty("起始地面高(mm)")
     private Float startGroundHeight;
 
     /**
      * 起始埋深(m)
      */
     @TableField("start_bury_deep")
+    @ExcelProperty("起始埋深(m)")
     private Float startBuryDeep;
 
     /**
      * 起始管顶高(mm)
      */
     @TableField("start_pipecrown_height")
+    @ExcelProperty("起始管顶高(mm)")
     private Float startPipecrownHeight;
     /**
      * 终止地面高(mm)
      */
     @TableField("end_ground_height")
+    @ExcelProperty("终止地面高(mm)")
     private Float endGroundHeight;
 
     /**
      * 终止埋深(m)
      */
     @TableField("end_bury_deep")
+    @ExcelProperty("终止埋深(m)")
     private Float endBuryDeep;
 
     /**
      * 终止管顶高(mm)
      */
     @TableField("end_pipecrown_height")
+    @ExcelProperty("终止管顶高(mm)")
     private Float endPipecrownHeight;
 
     /**
      * 设计压力(MPa)
      */
     @TableField("design_pressure")
-    private String designPressure;
+    @ExcelProperty("设计压力(Mpa)")
+    private Float designPressure;
 
     /**
      * 瞬时流量(m³)
      */
     @TableField("instantaneous_flow")
+    @ExcelProperty("瞬时流量(m³)")
     private Float instantaneousFlow;
 
     /*
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java
index 2ece87a..91dc311 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java
@@ -128,17 +128,24 @@
         //设置表头与字段映射,可通过反射获取
         Map<String, String> mapper = new HashMap<>();
         //判断唯一
-        mapper.put("管线编号", "wellCode");
-        mapper.put("管线名称", "wellName");
-        mapper.put("位置", "deep");
-        mapper.put("区", "qu");
-        mapper.put("街道", "area");
+        mapper.put("管线编号", "pipelineCode");
+        mapper.put("管线名称", "pipelineName");
+        mapper.put("管线类型", "pipelineType");
+        mapper.put("管径(mm)", "pipeDiameter");
+        mapper.put("材质", "material");
         mapper.put("详细地址", "position");
-        mapper.put("经度", "coordinateX");
-        mapper.put("纬度", "coordinateY");
-        mapper.put("点位类型", "wellType");
+        mapper.put("埋设方式", "buryMode");
+        mapper.put("管线位置", "pipelinePosition");
+        mapper.put("建设年代", "constructEra");
         mapper.put("权属单位代码", "deptid");
-        mapper.put("点位维护单位代码", "responsibleDept");
+        mapper.put("起始地面高(mm)", "startGroundHeight");
+        mapper.put("起始埋深(m)", "startBuryDeep");
+        mapper.put("起始管顶高(mm)", "startPipecrownHeight");
+        mapper.put("终止地面高(mm)", "endGroundHeight");
+        mapper.put("终止埋深(m)", "endBuryDeep");
+        mapper.put("终止管顶高(mm)", "endPipecrownHeight");
+        mapper.put("设计压力(Mpa)", "designPressure");
+        mapper.put("瞬时流量(m*m*m)", "instantaneousFlow");
         try {
             try (InputStream in = file.getInputStream()) {
                 results = this.importExcel(BusPipeline.class, file, null, null);
@@ -148,15 +155,12 @@
                     return new ErrorResponseData(list.get(0));
                 }
             }
-        } catch (MybatisPlusException e) {
-            log.error("导入管线列表失败", e);
-            String message = e.getCause().getCause().getCause().getMessage();
-            if (message.contains("Duplicate entry '")) {
-                return new ErrorResponseData("导入管线列表失败，管线编号" + message.replaceAll("Duplicate entry '", "").replaceAll("' for key 'PIPELINE_CODE'", "") + "已存在");
-            }
-            return new ErrorResponseData("导入管线列表失败");
         } catch (Exception e) {
             log.error("导入管线列表失败", e);
+            String message = e.getMessage();
+            if (message.contains("Duplicate entry '")||message.contains("唯一约束")) {
+                return new ErrorResponseData("导入管线列表失败，管线编号" + message.replaceAll("Duplicate entry '", "").replaceAll("' for key 'PIPELINE_CODE'", "") + "已存在");
+            }
             return new ErrorResponseData("导入管线列表失败");
         }
         return ResponseData.success();

diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusPipeline.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusPipeline.java
index e1bbce4..b988917 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusPipeline.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusPipeline.java
@@ -31,18 +31,21 @@
      * 管线编号
      */
     @TableField("pipeline_code")
+    @ExcelProperty("管线编号")
     private String pipelineCode;
 
     /**
      * 管线名称
      */
     @TableField("pipeline_name")
+    @ExcelProperty("管线名称")
     private String pipelineName;
 
     /**
      * 管线类型(下拉框）
      */
     @TableField("pipeline_type")
+    @ExcelProperty("管线类型")
     private String pipelineType;
 
     @TableField(exist = false)
@@ -52,33 +55,39 @@
      *  管径(mm)
      */
     @TableField("pipe_diameter")
+    @ExcelProperty("管径(mm)")
     private String pipeDiameter;
     /**
      * 材质
      */
     @TableField("material")
+    @ExcelProperty("材质")
     private String material;
 
     /**
      * 埋设方式
      */
     @TableField("bury_mode")
+    @ExcelProperty("埋设方式")
     private String buryMode;
     /**
      * 管线位置
      */
     @TableField("pipeline_position")
+    @ExcelProperty("管线位置")
     private String pipelinePosition;
     /**
      * 建设年代
      */
     @TableField("construct_era")
+    @ExcelProperty("建设年代")
     private String constructEra;
 
     /**
      * 权属单位(下拉框)
      */
     @TableField("deptid")
+    @ExcelProperty("权属单位代码")
     private Long deptid;
 
     /**
@@ -90,47 +99,55 @@
      * 起始地面高(mm)
      */
     @TableField("start_ground_height")
+    @ExcelProperty("起始地面高(mm)")
     private Float startGroundHeight;
 
     /**
      * 起始埋深(m)
      */
     @TableField("start_bury_deep")
+    @ExcelProperty("起始埋深(m)")
     private Float startBuryDeep;
 
     /**
      * 起始管顶高(mm)
      */
     @TableField("start_pipecrown_height")
+    @ExcelProperty("起始管顶高(mm)")
     private Float startPipecrownHeight;
     /**
      * 终止地面高(mm)
      */
     @TableField("end_ground_height")
+    @ExcelProperty("终止地面高(mm)")
     private Float endGroundHeight;
 
     /**
      * 终止埋深(m)
      */
     @TableField("end_bury_deep")
+    @ExcelProperty("终止埋深(m)")
     private Float endBuryDeep;
 
     /**
      * 终止管顶高(mm)
      */
     @TableField("end_pipecrown_height")
+    @ExcelProperty("终止管顶高(mm)")
     private Float endPipecrownHeight;
 
     /**
      * 设计压力(MPa)
      */
     @TableField("design_pressure")
-    private String designPressure;
+    @ExcelProperty("设计压力(Mpa)")
+    private Float designPressure;
 
     /**
      * 瞬时流量(m³)
      */
     @TableField("instantaneous_flow")
+    @ExcelProperty("瞬时流量(m³)")
     private Float instantaneousFlow;
 
     /*
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java
index 2ece87a..91dc311 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java
@@ -128,17 +128,24 @@
         //设置表头与字段映射,可通过反射获取
         Map<String, String> mapper = new HashMap<>();
         //判断唯一
-        mapper.put("管线编号", "wellCode");
-        mapper.put("管线名称", "wellName");
-        mapper.put("位置", "deep");
-        mapper.put("区", "qu");
-        mapper.put("街道", "area");
+        mapper.put("管线编号", "pipelineCode");
+        mapper.put("管线名称", "pipelineName");
+        mapper.put("管线类型", "pipelineType");
+        mapper.put("管径(mm)", "pipeDiameter");
+        mapper.put("材质", "material");
         mapper.put("详细地址", "position");
-        mapper.put("经度", "coordinateX");
-        mapper.put("纬度", "coordinateY");
-        mapper.put("点位类型", "wellType");
+        mapper.put("埋设方式", "buryMode");
+        mapper.put("管线位置", "pipelinePosition");
+        mapper.put("建设年代", "constructEra");
         mapper.put("权属单位代码", "deptid");
-        mapper.put("点位维护单位代码", "responsibleDept");
+        mapper.put("起始地面高(mm)", "startGroundHeight");
+        mapper.put("起始埋深(m)", "startBuryDeep");
+        mapper.put("起始管顶高(mm)", "startPipecrownHeight");
+        mapper.put("终止地面高(mm)", "endGroundHeight");
+        mapper.put("终止埋深(m)", "endBuryDeep");
+        mapper.put("终止管顶高(mm)", "endPipecrownHeight");
+        mapper.put("设计压力(Mpa)", "designPressure");
+        mapper.put("瞬时流量(m*m*m)", "instantaneousFlow");
         try {
             try (InputStream in = file.getInputStream()) {
                 results = this.importExcel(BusPipeline.class, file, null, null);
@@ -148,15 +155,12 @@
                     return new ErrorResponseData(list.get(0));
                 }
             }
-        } catch (MybatisPlusException e) {
-            log.error("导入管线列表失败", e);
-            String message = e.getCause().getCause().getCause().getMessage();
-            if (message.contains("Duplicate entry '")) {
-                return new ErrorResponseData("导入管线列表失败，管线编号" + message.replaceAll("Duplicate entry '", "").replaceAll("' for key 'PIPELINE_CODE'", "") + "已存在");
-            }
-            return new ErrorResponseData("导入管线列表失败");
         } catch (Exception e) {
             log.error("导入管线列表失败", e);
+            String message = e.getMessage();
+            if (message.contains("Duplicate entry '")||message.contains("唯一约束")) {
+                return new ErrorResponseData("导入管线列表失败，管线编号" + message.replaceAll("Duplicate entry '", "").replaceAll("' for key 'PIPELINE_CODE'", "") + "已存在");
+            }
             return new ErrorResponseData("导入管线列表失败");
         }
         return ResponseData.success();
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml
index de51f50..158c659 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml
@@ -41,9 +41,9 @@
 
 
     <select id="getDeptMap" resultType="java.util.Map">
-         SELECT
-
-
+         SELECT id AS "id",simple_name AS "simpleName"
+         FROM SYS_DEPT
+         WHERE  del_flag='0'
     </select>
 
 

diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusPipeline.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusPipeline.java
index e1bbce4..b988917 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusPipeline.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusPipeline.java
@@ -31,18 +31,21 @@
      * 管线编号
      */
     @TableField("pipeline_code")
+    @ExcelProperty("管线编号")
     private String pipelineCode;
 
     /**
      * 管线名称
      */
     @TableField("pipeline_name")
+    @ExcelProperty("管线名称")
     private String pipelineName;
 
     /**
      * 管线类型(下拉框）
      */
     @TableField("pipeline_type")
+    @ExcelProperty("管线类型")
     private String pipelineType;
 
     @TableField(exist = false)
@@ -52,33 +55,39 @@
      *  管径(mm)
      */
     @TableField("pipe_diameter")
+    @ExcelProperty("管径(mm)")
     private String pipeDiameter;
     /**
      * 材质
      */
     @TableField("material")
+    @ExcelProperty("材质")
     private String material;
 
     /**
      * 埋设方式
      */
     @TableField("bury_mode")
+    @ExcelProperty("埋设方式")
     private String buryMode;
     /**
      * 管线位置
      */
     @TableField("pipeline_position")
+    @ExcelProperty("管线位置")
     private String pipelinePosition;
     /**
      * 建设年代
      */
     @TableField("construct_era")
+    @ExcelProperty("建设年代")
     private String constructEra;
 
     /**
      * 权属单位(下拉框)
      */
     @TableField("deptid")
+    @ExcelProperty("权属单位代码")
     private Long deptid;
 
     /**
@@ -90,47 +99,55 @@
      * 起始地面高(mm)
      */
     @TableField("start_ground_height")
+    @ExcelProperty("起始地面高(mm)")
     private Float startGroundHeight;
 
     /**
      * 起始埋深(m)
      */
     @TableField("start_bury_deep")
+    @ExcelProperty("起始埋深(m)")
     private Float startBuryDeep;
 
     /**
      * 起始管顶高(mm)
      */
     @TableField("start_pipecrown_height")
+    @ExcelProperty("起始管顶高(mm)")
     private Float startPipecrownHeight;
     /**
      * 终止地面高(mm)
      */
     @TableField("end_ground_height")
+    @ExcelProperty("终止地面高(mm)")
     private Float endGroundHeight;
 
     /**
      * 终止埋深(m)
      */
     @TableField("end_bury_deep")
+    @ExcelProperty("终止埋深(m)")
     private Float endBuryDeep;
 
     /**
      * 终止管顶高(mm)
      */
     @TableField("end_pipecrown_height")
+    @ExcelProperty("终止管顶高(mm)")
     private Float endPipecrownHeight;
 
     /**
      * 设计压力(MPa)
      */
     @TableField("design_pressure")
-    private String designPressure;
+    @ExcelProperty("设计压力(Mpa)")
+    private Float designPressure;
 
     /**
      * 瞬时流量(m³)
      */
     @TableField("instantaneous_flow")
+    @ExcelProperty("瞬时流量(m³)")
     private Float instantaneousFlow;
 
     /*
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java
index 2ece87a..91dc311 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java
@@ -128,17 +128,24 @@
         //设置表头与字段映射,可通过反射获取
         Map<String, String> mapper = new HashMap<>();
         //判断唯一
-        mapper.put("管线编号", "wellCode");
-        mapper.put("管线名称", "wellName");
-        mapper.put("位置", "deep");
-        mapper.put("区", "qu");
-        mapper.put("街道", "area");
+        mapper.put("管线编号", "pipelineCode");
+        mapper.put("管线名称", "pipelineName");
+        mapper.put("管线类型", "pipelineType");
+        mapper.put("管径(mm)", "pipeDiameter");
+        mapper.put("材质", "material");
         mapper.put("详细地址", "position");
-        mapper.put("经度", "coordinateX");
-        mapper.put("纬度", "coordinateY");
-        mapper.put("点位类型", "wellType");
+        mapper.put("埋设方式", "buryMode");
+        mapper.put("管线位置", "pipelinePosition");
+        mapper.put("建设年代", "constructEra");
         mapper.put("权属单位代码", "deptid");
-        mapper.put("点位维护单位代码", "responsibleDept");
+        mapper.put("起始地面高(mm)", "startGroundHeight");
+        mapper.put("起始埋深(m)", "startBuryDeep");
+        mapper.put("起始管顶高(mm)", "startPipecrownHeight");
+        mapper.put("终止地面高(mm)", "endGroundHeight");
+        mapper.put("终止埋深(m)", "endBuryDeep");
+        mapper.put("终止管顶高(mm)", "endPipecrownHeight");
+        mapper.put("设计压力(Mpa)", "designPressure");
+        mapper.put("瞬时流量(m*m*m)", "instantaneousFlow");
         try {
             try (InputStream in = file.getInputStream()) {
                 results = this.importExcel(BusPipeline.class, file, null, null);
@@ -148,15 +155,12 @@
                     return new ErrorResponseData(list.get(0));
                 }
             }
-        } catch (MybatisPlusException e) {
-            log.error("导入管线列表失败", e);
-            String message = e.getCause().getCause().getCause().getMessage();
-            if (message.contains("Duplicate entry '")) {
-                return new ErrorResponseData("导入管线列表失败，管线编号" + message.replaceAll("Duplicate entry '", "").replaceAll("' for key 'PIPELINE_CODE'", "") + "已存在");
-            }
-            return new ErrorResponseData("导入管线列表失败");
         } catch (Exception e) {
             log.error("导入管线列表失败", e);
+            String message = e.getMessage();
+            if (message.contains("Duplicate entry '")||message.contains("唯一约束")) {
+                return new ErrorResponseData("导入管线列表失败，管线编号" + message.replaceAll("Duplicate entry '", "").replaceAll("' for key 'PIPELINE_CODE'", "") + "已存在");
+            }
             return new ErrorResponseData("导入管线列表失败");
         }
         return ResponseData.success();
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml
index de51f50..158c659 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml
@@ -41,9 +41,9 @@
 
 
     <select id="getDeptMap" resultType="java.util.Map">
-         SELECT
-
-
+         SELECT id AS "id",simple_name AS "simpleName"
+         FROM SYS_DEPT
+         WHERE  del_flag='0'
     </select>
 
 
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusPipelineServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusPipelineServiceImpl.java
index 8738877..8a045af 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusPipelineServiceImpl.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusPipelineServiceImpl.java
@@ -27,6 +27,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @author cz
@@ -72,8 +73,10 @@
             dicts.forEach(dict -> {
                 pipelineTypeMap.put(dict.getName(), dict.getCode());
             });
-
-            List<Map<String, Object>> deptMap = this.baseMapper.getDeptMap();//管线类型
+            List<Map<String, Object>> deptList = this.baseMapper.getDeptMap();//部门名称
+            Map<Long, Object> deptMap = deptList.stream().collect(
+                    Collectors.toMap(e->(Long)e.get("id"),e->e.get("simpleName"))
+            );
             final Integer[] index = {0};
             for (BusPipeline busPipeline : results) {
                 index[0]++;
@@ -97,7 +100,10 @@
                     list.add("第" + index[0] + "行，井类型不存在！");
                     break;
                 }
-
+                if (deptMap.containsKey(busPipeline.getDeptid())) {
+                    list.add("第" + index[0] + "行，权属单位代码不存在！");
+                    break;
+                }
                 //其他相关性校验
                 log.info("第" + index[0] + "行校验完毕！");
             }
@@ -119,5 +125,4 @@
         return list;
     }
 
-
 }