diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 63906f7..102e2a3 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -120,7 +120,6 @@
         return new SuccessResponseData(list);
     }
 
-
     @ApiOperation("获取设备类型列表")
     @GetMapping(value = "/type")
     @ResponseBody
@@ -140,11 +139,13 @@
     @GetMapping(value = "/model")
     @ResponseBody
     public Object model(String deviceType) {
+
         //设备类型列表查询
         EntityWrapper<DeviceModels> query = new EntityWrapper<>();
         if (ToolUtil.isNotEmpty(deviceType)) {
             query.eq(DEVICE_QUERY_DEVICE_TYPE, deviceType);
         }
+
         List<DeviceModels> list = deviceModelsService.selectList(query);
         List<DeviceSelectDto> selectDtos = new ArrayList<>();
         if (ToolUtil.isNotEmpty(list)) {
@@ -152,7 +153,9 @@
                 selectDtos.add(new DeviceSelectDto(deviceModels.getModelName(), deviceModels.getId(), deviceModels.getDeviceType()));
             });
         }
+
         return ResponseData.success(selectDtos);
+
     }
 
     @ApiOperation("批量导入设备")
@@ -168,16 +171,16 @@
         mapper.put("设备名称", "deviceName");
         //需要转换
         mapper.put("设备类型", "deviceTypeName");
-        //需要转换
         mapper.put("设备型号", "modelName");
-        //需要转换
         mapper.put("井编号", "wellCode");
-        //需要转换
         mapper.put("数据集中器编号", "concenCode");
+
         mapper.put("设备安装时间", "installDateFmt");
         mapper.put("网络类型", "networkType");
         mapper.put("通信协议", "protocol");
+        mapper.put("井权属单位名称", "deptName");
         try {
+
             try (InputStream in = file.getInputStream()) {
                 ExcelIO.read(in, mapper, Device.class, (row) -> {
                     //仅读取第一个sheet
@@ -199,17 +202,14 @@
                 });
 
                 List<String> list = deviceService.addDeviceBatch(results);
-
                 if (!ToolUtil.isEmpty(list)) {
                     //获取第校验报错信息
                     return new ErrorResponseData(list.get(0));
                 }
-
             }
         } catch (Exception e) {
             return catchMybatisPlusException(e, "导入设备失败");
         }
-
         return ResponseData.success();
     }
 
@@ -244,6 +244,7 @@
     @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class)
     @ResponseBody
     public Object add(@Valid Device device, BindingResult result) {
+
         if (result.hasErrors()) {
             return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage());
         }
@@ -263,10 +264,12 @@
             gunsException.setMessage(errorMsg);
             throw gunsException;
         }
+
         return ResponseData.success();
     }
 
     private ResponseData catchMybatisPlusException(Exception e, String errorMsg) {
+
         if (e instanceof GunsException) {
             GunsException guns = (GunsException) e;
             return ResponseData.success(guns.getCode(), guns.getMessage(), null);
@@ -277,6 +280,7 @@
                 return new ErrorResponseData("设备编号重复:" + message.replaceAll("Duplicate entry '", "").replaceAll("' for key 'DEVCODE'", ""));
             }
         }
+
         logger.error(errorMsg, e);
         return new ErrorResponseData(errorMsg);
     }

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 63906f7..102e2a3 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -120,7 +120,6 @@
         return new SuccessResponseData(list);
     }
 
-
     @ApiOperation("获取设备类型列表")
     @GetMapping(value = "/type")
     @ResponseBody
@@ -140,11 +139,13 @@
     @GetMapping(value = "/model")
     @ResponseBody
     public Object model(String deviceType) {
+
         //设备类型列表查询
         EntityWrapper<DeviceModels> query = new EntityWrapper<>();
         if (ToolUtil.isNotEmpty(deviceType)) {
             query.eq(DEVICE_QUERY_DEVICE_TYPE, deviceType);
         }
+
         List<DeviceModels> list = deviceModelsService.selectList(query);
         List<DeviceSelectDto> selectDtos = new ArrayList<>();
         if (ToolUtil.isNotEmpty(list)) {
@@ -152,7 +153,9 @@
                 selectDtos.add(new DeviceSelectDto(deviceModels.getModelName(), deviceModels.getId(), deviceModels.getDeviceType()));
             });
         }
+
         return ResponseData.success(selectDtos);
+
     }
 
     @ApiOperation("批量导入设备")
@@ -168,16 +171,16 @@
         mapper.put("设备名称", "deviceName");
         //需要转换
         mapper.put("设备类型", "deviceTypeName");
-        //需要转换
         mapper.put("设备型号", "modelName");
-        //需要转换
         mapper.put("井编号", "wellCode");
-        //需要转换
         mapper.put("数据集中器编号", "concenCode");
+
         mapper.put("设备安装时间", "installDateFmt");
         mapper.put("网络类型", "networkType");
         mapper.put("通信协议", "protocol");
+        mapper.put("井权属单位名称", "deptName");
         try {
+
             try (InputStream in = file.getInputStream()) {
                 ExcelIO.read(in, mapper, Device.class, (row) -> {
                     //仅读取第一个sheet
@@ -199,17 +202,14 @@
                 });
 
                 List<String> list = deviceService.addDeviceBatch(results);
-
                 if (!ToolUtil.isEmpty(list)) {
                     //获取第校验报错信息
                     return new ErrorResponseData(list.get(0));
                 }
-
             }
         } catch (Exception e) {
             return catchMybatisPlusException(e, "导入设备失败");
         }
-
         return ResponseData.success();
     }
 
@@ -244,6 +244,7 @@
     @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class)
     @ResponseBody
     public Object add(@Valid Device device, BindingResult result) {
+
         if (result.hasErrors()) {
             return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage());
         }
@@ -263,10 +264,12 @@
             gunsException.setMessage(errorMsg);
             throw gunsException;
         }
+
         return ResponseData.success();
     }
 
     private ResponseData catchMybatisPlusException(Exception e, String errorMsg) {
+
         if (e instanceof GunsException) {
             GunsException guns = (GunsException) e;
             return ResponseData.success(guns.getCode(), guns.getMessage(), null);
@@ -277,6 +280,7 @@
                 return new ErrorResponseData("设备编号重复:" + message.replaceAll("Duplicate entry '", "").replaceAll("' for key 'DEVCODE'", ""));
             }
         }
+
         logger.error(errorMsg, e);
         return new ErrorResponseData(errorMsg);
     }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index 4ed73db..3059dd7 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -23,7 +23,7 @@
 
     List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("deptIds") List<Long> deptIds,@Param("isOnline") String isOnline, @Param("maxCell") float maxCell);
 
-    DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode);
+    DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode,@Param("deptId") String deptId);
 
     DeviceConcentratorDto selectDeviceConcentorByCode(@Param("concenCode") String concenCode);
 

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 63906f7..102e2a3 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -120,7 +120,6 @@
         return new SuccessResponseData(list);
     }
 
-
     @ApiOperation("获取设备类型列表")
     @GetMapping(value = "/type")
     @ResponseBody
@@ -140,11 +139,13 @@
     @GetMapping(value = "/model")
     @ResponseBody
     public Object model(String deviceType) {
+
         //设备类型列表查询
         EntityWrapper<DeviceModels> query = new EntityWrapper<>();
         if (ToolUtil.isNotEmpty(deviceType)) {
             query.eq(DEVICE_QUERY_DEVICE_TYPE, deviceType);
         }
+
         List<DeviceModels> list = deviceModelsService.selectList(query);
         List<DeviceSelectDto> selectDtos = new ArrayList<>();
         if (ToolUtil.isNotEmpty(list)) {
@@ -152,7 +153,9 @@
                 selectDtos.add(new DeviceSelectDto(deviceModels.getModelName(), deviceModels.getId(), deviceModels.getDeviceType()));
             });
         }
+
         return ResponseData.success(selectDtos);
+
     }
 
     @ApiOperation("批量导入设备")
@@ -168,16 +171,16 @@
         mapper.put("设备名称", "deviceName");
         //需要转换
         mapper.put("设备类型", "deviceTypeName");
-        //需要转换
         mapper.put("设备型号", "modelName");
-        //需要转换
         mapper.put("井编号", "wellCode");
-        //需要转换
         mapper.put("数据集中器编号", "concenCode");
+
         mapper.put("设备安装时间", "installDateFmt");
         mapper.put("网络类型", "networkType");
         mapper.put("通信协议", "protocol");
+        mapper.put("井权属单位名称", "deptName");
         try {
+
             try (InputStream in = file.getInputStream()) {
                 ExcelIO.read(in, mapper, Device.class, (row) -> {
                     //仅读取第一个sheet
@@ -199,17 +202,14 @@
                 });
 
                 List<String> list = deviceService.addDeviceBatch(results);
-
                 if (!ToolUtil.isEmpty(list)) {
                     //获取第校验报错信息
                     return new ErrorResponseData(list.get(0));
                 }
-
             }
         } catch (Exception e) {
             return catchMybatisPlusException(e, "导入设备失败");
         }
-
         return ResponseData.success();
     }
 
@@ -244,6 +244,7 @@
     @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class)
     @ResponseBody
     public Object add(@Valid Device device, BindingResult result) {
+
         if (result.hasErrors()) {
             return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage());
         }
@@ -263,10 +264,12 @@
             gunsException.setMessage(errorMsg);
             throw gunsException;
         }
+
         return ResponseData.success();
     }
 
     private ResponseData catchMybatisPlusException(Exception e, String errorMsg) {
+
         if (e instanceof GunsException) {
             GunsException guns = (GunsException) e;
             return ResponseData.success(guns.getCode(), guns.getMessage(), null);
@@ -277,6 +280,7 @@
                 return new ErrorResponseData("设备编号重复:" + message.replaceAll("Duplicate entry '", "").replaceAll("' for key 'DEVCODE'", ""));
             }
         }
+
         logger.error(errorMsg, e);
         return new ErrorResponseData(errorMsg);
     }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index 4ed73db..3059dd7 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -23,7 +23,7 @@
 
     List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("deptIds") List<Long> deptIds,@Param("isOnline") String isOnline, @Param("maxCell") float maxCell);
 
-    DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode);
+    DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode,@Param("deptId") String deptId);
 
     DeviceConcentratorDto selectDeviceConcentorByCode(@Param("concenCode") String concenCode);
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 655a57a..73a88cc 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -37,6 +37,7 @@
         FROM bus_well_info
         WHERE VALID = '1'
           AND WELL_CODE = #{wellCode}
+          AND DEPTID = #{deptId}
     </select>
 
     <select id="selectDeviceConcentorByCode" resultType="com.casic.missiles.modular.system.dto.DeviceConcentratorDto">

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 63906f7..102e2a3 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -120,7 +120,6 @@
         return new SuccessResponseData(list);
     }
 
-
     @ApiOperation("获取设备类型列表")
     @GetMapping(value = "/type")
     @ResponseBody
@@ -140,11 +139,13 @@
     @GetMapping(value = "/model")
     @ResponseBody
     public Object model(String deviceType) {
+
         //设备类型列表查询
         EntityWrapper<DeviceModels> query = new EntityWrapper<>();
         if (ToolUtil.isNotEmpty(deviceType)) {
             query.eq(DEVICE_QUERY_DEVICE_TYPE, deviceType);
         }
+
         List<DeviceModels> list = deviceModelsService.selectList(query);
         List<DeviceSelectDto> selectDtos = new ArrayList<>();
         if (ToolUtil.isNotEmpty(list)) {
@@ -152,7 +153,9 @@
                 selectDtos.add(new DeviceSelectDto(deviceModels.getModelName(), deviceModels.getId(), deviceModels.getDeviceType()));
             });
         }
+
         return ResponseData.success(selectDtos);
+
     }
 
     @ApiOperation("批量导入设备")
@@ -168,16 +171,16 @@
         mapper.put("设备名称", "deviceName");
         //需要转换
         mapper.put("设备类型", "deviceTypeName");
-        //需要转换
         mapper.put("设备型号", "modelName");
-        //需要转换
         mapper.put("井编号", "wellCode");
-        //需要转换
         mapper.put("数据集中器编号", "concenCode");
+
         mapper.put("设备安装时间", "installDateFmt");
         mapper.put("网络类型", "networkType");
         mapper.put("通信协议", "protocol");
+        mapper.put("井权属单位名称", "deptName");
         try {
+
             try (InputStream in = file.getInputStream()) {
                 ExcelIO.read(in, mapper, Device.class, (row) -> {
                     //仅读取第一个sheet
@@ -199,17 +202,14 @@
                 });
 
                 List<String> list = deviceService.addDeviceBatch(results);
-
                 if (!ToolUtil.isEmpty(list)) {
                     //获取第校验报错信息
                     return new ErrorResponseData(list.get(0));
                 }
-
             }
         } catch (Exception e) {
             return catchMybatisPlusException(e, "导入设备失败");
         }
-
         return ResponseData.success();
     }
 
@@ -244,6 +244,7 @@
     @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class)
     @ResponseBody
     public Object add(@Valid Device device, BindingResult result) {
+
         if (result.hasErrors()) {
             return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage());
         }
@@ -263,10 +264,12 @@
             gunsException.setMessage(errorMsg);
             throw gunsException;
         }
+
         return ResponseData.success();
     }
 
     private ResponseData catchMybatisPlusException(Exception e, String errorMsg) {
+
         if (e instanceof GunsException) {
             GunsException guns = (GunsException) e;
             return ResponseData.success(guns.getCode(), guns.getMessage(), null);
@@ -277,6 +280,7 @@
                 return new ErrorResponseData("设备编号重复:" + message.replaceAll("Duplicate entry '", "").replaceAll("' for key 'DEVCODE'", ""));
             }
         }
+
         logger.error(errorMsg, e);
         return new ErrorResponseData(errorMsg);
     }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index 4ed73db..3059dd7 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -23,7 +23,7 @@
 
     List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("deptIds") List<Long> deptIds,@Param("isOnline") String isOnline, @Param("maxCell") float maxCell);
 
-    DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode);
+    DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode,@Param("deptId") String deptId);
 
     DeviceConcentratorDto selectDeviceConcentorByCode(@Param("concenCode") String concenCode);
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 655a57a..73a88cc 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -37,6 +37,7 @@
         FROM bus_well_info
         WHERE VALID = '1'
           AND WELL_CODE = #{wellCode}
+          AND DEPTID = #{deptId}
     </select>
 
     <select id="selectDeviceConcentorByCode" resultType="com.casic.missiles.modular.system.dto.DeviceConcentratorDto">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/Device.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/Device.java
index b8ad47d..d240286 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/model/Device.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/Device.java
@@ -108,6 +108,17 @@
     @TableField(exist = false)
     private String installDateFmt;
 
+    /**
+     * 井权属单位
+     */
+    @TableField(exist = false)
+    private String deptId;
+    /**
+     * 井权属单位 名称
+     */
+    @TableField(exist = false)
+    private String deptName;
+
     @Override
     protected Serializable pkVal() {
         return this.id;

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 63906f7..102e2a3 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -120,7 +120,6 @@
         return new SuccessResponseData(list);
     }
 
-
     @ApiOperation("获取设备类型列表")
     @GetMapping(value = "/type")
     @ResponseBody
@@ -140,11 +139,13 @@
     @GetMapping(value = "/model")
     @ResponseBody
     public Object model(String deviceType) {
+
         //设备类型列表查询
         EntityWrapper<DeviceModels> query = new EntityWrapper<>();
         if (ToolUtil.isNotEmpty(deviceType)) {
             query.eq(DEVICE_QUERY_DEVICE_TYPE, deviceType);
         }
+
         List<DeviceModels> list = deviceModelsService.selectList(query);
         List<DeviceSelectDto> selectDtos = new ArrayList<>();
         if (ToolUtil.isNotEmpty(list)) {
@@ -152,7 +153,9 @@
                 selectDtos.add(new DeviceSelectDto(deviceModels.getModelName(), deviceModels.getId(), deviceModels.getDeviceType()));
             });
         }
+
         return ResponseData.success(selectDtos);
+
     }
 
     @ApiOperation("批量导入设备")
@@ -168,16 +171,16 @@
         mapper.put("设备名称", "deviceName");
         //需要转换
         mapper.put("设备类型", "deviceTypeName");
-        //需要转换
         mapper.put("设备型号", "modelName");
-        //需要转换
         mapper.put("井编号", "wellCode");
-        //需要转换
         mapper.put("数据集中器编号", "concenCode");
+
         mapper.put("设备安装时间", "installDateFmt");
         mapper.put("网络类型", "networkType");
         mapper.put("通信协议", "protocol");
+        mapper.put("井权属单位名称", "deptName");
         try {
+
             try (InputStream in = file.getInputStream()) {
                 ExcelIO.read(in, mapper, Device.class, (row) -> {
                     //仅读取第一个sheet
@@ -199,17 +202,14 @@
                 });
 
                 List<String> list = deviceService.addDeviceBatch(results);
-
                 if (!ToolUtil.isEmpty(list)) {
                     //获取第校验报错信息
                     return new ErrorResponseData(list.get(0));
                 }
-
             }
         } catch (Exception e) {
             return catchMybatisPlusException(e, "导入设备失败");
         }
-
         return ResponseData.success();
     }
 
@@ -244,6 +244,7 @@
     @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class)
     @ResponseBody
     public Object add(@Valid Device device, BindingResult result) {
+
         if (result.hasErrors()) {
             return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage());
         }
@@ -263,10 +264,12 @@
             gunsException.setMessage(errorMsg);
             throw gunsException;
         }
+
         return ResponseData.success();
     }
 
     private ResponseData catchMybatisPlusException(Exception e, String errorMsg) {
+
         if (e instanceof GunsException) {
             GunsException guns = (GunsException) e;
             return ResponseData.success(guns.getCode(), guns.getMessage(), null);
@@ -277,6 +280,7 @@
                 return new ErrorResponseData("设备编号重复:" + message.replaceAll("Duplicate entry '", "").replaceAll("' for key 'DEVCODE'", ""));
             }
         }
+
         logger.error(errorMsg, e);
         return new ErrorResponseData(errorMsg);
     }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index 4ed73db..3059dd7 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -23,7 +23,7 @@
 
     List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("deptIds") List<Long> deptIds,@Param("isOnline") String isOnline, @Param("maxCell") float maxCell);
 
-    DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode);
+    DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode,@Param("deptId") String deptId);
 
     DeviceConcentratorDto selectDeviceConcentorByCode(@Param("concenCode") String concenCode);
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 655a57a..73a88cc 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -37,6 +37,7 @@
         FROM bus_well_info
         WHERE VALID = '1'
           AND WELL_CODE = #{wellCode}
+          AND DEPTID = #{deptId}
     </select>
 
     <select id="selectDeviceConcentorByCode" resultType="com.casic.missiles.modular.system.dto.DeviceConcentratorDto">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/Device.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/Device.java
index b8ad47d..d240286 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/model/Device.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/Device.java
@@ -108,6 +108,17 @@
     @TableField(exist = false)
     private String installDateFmt;
 
+    /**
+     * 井权属单位
+     */
+    @TableField(exist = false)
+    private String deptId;
+    /**
+     * 井权属单位 名称
+     */
+    @TableField(exist = false)
+    private String deptName;
+
     @Override
     protected Serializable pkVal() {
         return this.id;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
index 71eea35..a589497 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
@@ -39,7 +39,7 @@
      * @param wellCode
      * @return
      */
-    DeviceWellDto selectWellIdByCode(String wellCode);
+    DeviceWellDto selectWellIdByCode(String wellCode,String deptId);
 
 
     Device getDeviceByDevCode(String devCode);

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 63906f7..102e2a3 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -120,7 +120,6 @@
         return new SuccessResponseData(list);
     }
 
-
     @ApiOperation("获取设备类型列表")
     @GetMapping(value = "/type")
     @ResponseBody
@@ -140,11 +139,13 @@
     @GetMapping(value = "/model")
     @ResponseBody
     public Object model(String deviceType) {
+
         //设备类型列表查询
         EntityWrapper<DeviceModels> query = new EntityWrapper<>();
         if (ToolUtil.isNotEmpty(deviceType)) {
             query.eq(DEVICE_QUERY_DEVICE_TYPE, deviceType);
         }
+
         List<DeviceModels> list = deviceModelsService.selectList(query);
         List<DeviceSelectDto> selectDtos = new ArrayList<>();
         if (ToolUtil.isNotEmpty(list)) {
@@ -152,7 +153,9 @@
                 selectDtos.add(new DeviceSelectDto(deviceModels.getModelName(), deviceModels.getId(), deviceModels.getDeviceType()));
             });
         }
+
         return ResponseData.success(selectDtos);
+
     }
 
     @ApiOperation("批量导入设备")
@@ -168,16 +171,16 @@
         mapper.put("设备名称", "deviceName");
         //需要转换
         mapper.put("设备类型", "deviceTypeName");
-        //需要转换
         mapper.put("设备型号", "modelName");
-        //需要转换
         mapper.put("井编号", "wellCode");
-        //需要转换
         mapper.put("数据集中器编号", "concenCode");
+
         mapper.put("设备安装时间", "installDateFmt");
         mapper.put("网络类型", "networkType");
         mapper.put("通信协议", "protocol");
+        mapper.put("井权属单位名称", "deptName");
         try {
+
             try (InputStream in = file.getInputStream()) {
                 ExcelIO.read(in, mapper, Device.class, (row) -> {
                     //仅读取第一个sheet
@@ -199,17 +202,14 @@
                 });
 
                 List<String> list = deviceService.addDeviceBatch(results);
-
                 if (!ToolUtil.isEmpty(list)) {
                     //获取第校验报错信息
                     return new ErrorResponseData(list.get(0));
                 }
-
             }
         } catch (Exception e) {
             return catchMybatisPlusException(e, "导入设备失败");
         }
-
         return ResponseData.success();
     }
 
@@ -244,6 +244,7 @@
     @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class)
     @ResponseBody
     public Object add(@Valid Device device, BindingResult result) {
+
         if (result.hasErrors()) {
             return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage());
         }
@@ -263,10 +264,12 @@
             gunsException.setMessage(errorMsg);
             throw gunsException;
         }
+
         return ResponseData.success();
     }
 
     private ResponseData catchMybatisPlusException(Exception e, String errorMsg) {
+
         if (e instanceof GunsException) {
             GunsException guns = (GunsException) e;
             return ResponseData.success(guns.getCode(), guns.getMessage(), null);
@@ -277,6 +280,7 @@
                 return new ErrorResponseData("设备编号重复:" + message.replaceAll("Duplicate entry '", "").replaceAll("' for key 'DEVCODE'", ""));
             }
         }
+
         logger.error(errorMsg, e);
         return new ErrorResponseData(errorMsg);
     }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index 4ed73db..3059dd7 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -23,7 +23,7 @@
 
     List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("deptIds") List<Long> deptIds,@Param("isOnline") String isOnline, @Param("maxCell") float maxCell);
 
-    DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode);
+    DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode,@Param("deptId") String deptId);
 
     DeviceConcentratorDto selectDeviceConcentorByCode(@Param("concenCode") String concenCode);
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 655a57a..73a88cc 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -37,6 +37,7 @@
         FROM bus_well_info
         WHERE VALID = '1'
           AND WELL_CODE = #{wellCode}
+          AND DEPTID = #{deptId}
     </select>
 
     <select id="selectDeviceConcentorByCode" resultType="com.casic.missiles.modular.system.dto.DeviceConcentratorDto">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/Device.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/Device.java
index b8ad47d..d240286 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/model/Device.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/Device.java
@@ -108,6 +108,17 @@
     @TableField(exist = false)
     private String installDateFmt;
 
+    /**
+     * 井权属单位
+     */
+    @TableField(exist = false)
+    private String deptId;
+    /**
+     * 井权属单位 名称
+     */
+    @TableField(exist = false)
+    private String deptName;
+
     @Override
     protected Serializable pkVal() {
         return this.id;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
index 71eea35..a589497 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
@@ -39,7 +39,7 @@
      * @param wellCode
      * @return
      */
-    DeviceWellDto selectWellIdByCode(String wellCode);
+    DeviceWellDto selectWellIdByCode(String wellCode,String deptId);
 
 
     Device getDeviceByDevCode(String devCode);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index 60f445b..7aeef12 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.exception.GunsException;
 import com.casic.missiles.core.exception.GunsExceptionEnum;
+import com.casic.missiles.core.util.Convert;
 import com.casic.missiles.core.util.DateUtil;
 import com.casic.missiles.core.util.ToolUtil;
 import com.casic.missiles.modular.system.constant.DeviceConst;
@@ -39,6 +40,7 @@
 import java.io.Serializable;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -108,7 +110,7 @@
     @Override
     public boolean insert(Device entity) {
         //根据井编号查询井信息
-        DeviceWellDto wellDto = this.selectWellIdByCode(entity.getWellCode());
+        DeviceWellDto wellDto = this.selectWellIdByCode(entity.getWellCode(), entity.getDeptId());
         if (ToolUtil.isEmpty(wellDto)) {
             GunsException gunsException = new GunsException(GunsExceptionEnum.REQUEST_NULL);
             gunsException.setMessage("闸井编号不存在");
@@ -139,7 +141,7 @@
         entity.setSecretKey(secretKey);
         boolean flag = super.insert(entity);
 
-        //        insertSecretKey(entity.getDevcode(),true);
+        //insertSecretKey(entity.getDevcode(),true);
 
         //关联设备集中器信息
         if (isAddConcentrator) {
@@ -158,7 +160,7 @@
 
         //根据井编号查询井信息
         if (ToolUtil.isNotEmpty(entity.getWellCode())) {
-            DeviceWellDto wellDto = this.selectWellIdByCode(entity.getWellCode());
+            DeviceWellDto wellDto = this.selectWellIdByCode(entity.getWellCode(), entity.getDeptId());
             if (ToolUtil.isEmpty(wellDto)) {
                 GunsException gunsException = new GunsException(GunsExceptionEnum.REQUEST_NULL);
                 gunsException.setMessage("闸井编号不存在");
@@ -240,8 +242,8 @@
     }
 
     @Override
-    public DeviceWellDto selectWellIdByCode(String wellCode) {
-        return this.baseMapper.selectWellIdByCode(wellCode);
+    public DeviceWellDto selectWellIdByCode(String wellCode, String deptId) {
+        return this.baseMapper.selectWellIdByCode(wellCode, deptId);
     }
 
     @Override
@@ -260,31 +262,40 @@
     @Transactional
     @Override
     public List<String> addDeviceBatch(List<Device> results) {
+        //读取全部组织信息
+        List<Dept> deptList = permissionService.getAllDepts("");
+        Map<String, Dept> deptMaps = deptList.stream().collect(Collectors.toMap(Dept::getFullname, dept -> dept));
 
         BeanPropertyBindingResult beanPropertyBindingResult = new BeanPropertyBindingResult(Device.class, "设备类型导入校验");
         Map<String, Boolean> isAddConcentrator = new HashMap<>();
         List<String> list = new ArrayList<>();
+
         if (!ToolUtil.isEmpty(results)) {
             final Integer[] index = {0};
             StringBuilder wellInfoCodes = new StringBuilder();
             //--------------------------
-            results.forEach(device -> {
+            for (Device result : results) {
                 index[0]++;
                 //查询是否存在
-                DeviceWellDto wellDto = this.selectWellIdByCode(device.getWellCode());
+                Dept dept = deptMaps.get(result.getDeptName());
+                if (dept == null) {
+                    wellInfoCodes.append(index[0]).append(",");
+                    continue;
+                }
+                result.setDeptId(Convert.toStr(dept.getId()));
+                DeviceWellDto wellDto = this.selectWellIdByCode(result.getWellCode(), result.getDeptId());
                 if (ToolUtil.isOneEmpty(wellDto)) {
                     wellInfoCodes.append(index[0]).append(",");
                 }
-            });
+            }
             if (ToolUtil.isNotEmpty(wellInfoCodes.toString())) {
-                list.add("第" + wellInfoCodes.substring(0, wellInfoCodes.length() - 1) + "行,闸井编号不存在");
+                list.add("第" + wellInfoCodes.substring(0, wellInfoCodes.length() - 1) + "行,该组织下闸井编号不存在");
                 GunsException gunsException = new GunsException(BizExceptionEnum.OLD_PWD_NOT_RIGHT);
                 gunsException.setMessage(list.get(0));
                 throw gunsException;
-
             }
-            //--------------------------
 
+            //--------------------------
             index[0] = 0;
             results.forEach(device -> {
                 index[0]++;
@@ -306,7 +317,6 @@
                     return;
                 }
 
-
                 //设备型号校验
                 DeviceModels deviceModels = deviceModelsService.selectDeviceModelsBymodelName(device.getModelName());
                 if (ToolUtil.isEmpty(deviceModels)) {
@@ -317,14 +327,11 @@
                     list.add("第" + index[0] + "行,设备类型与设备型号不匹配");
                     return;
                 }
-
-
-                DeviceWellDto wellDto = this.selectWellIdByCode(device.getWellCode());
+                DeviceWellDto wellDto = this.selectWellIdByCode(device.getWellCode(), device.getDeptId());
                 if (ToolUtil.isOneEmpty(wellDto)) {
                     list.add("第" + index[0] + "行,闸井编号不存在");
                     return;
                 }
-
                 //如果非NB则判断集中器 即设备类型包含1
                 List<String> communis = Arrays.asList(deviceModels.getCommunication().split(","));
                 //优先判断设备类型配置
@@ -356,8 +363,7 @@
                 device.setModelId(deviceModels.getId());
                 device.setWellId(wellDto.getWellId());
                 device.setSecretKey(secretKey);
-
-                //                insertSecretKey(device.getDevcode(),true);
+                //insertSecretKey(device.getDevcode(),true);
             });
 
             if (ToolUtil.isNotEmpty(list)) {

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 63906f7..102e2a3 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -120,7 +120,6 @@
         return new SuccessResponseData(list);
     }
 
-
     @ApiOperation("获取设备类型列表")
     @GetMapping(value = "/type")
     @ResponseBody
@@ -140,11 +139,13 @@
     @GetMapping(value = "/model")
     @ResponseBody
     public Object model(String deviceType) {
+
         //设备类型列表查询
         EntityWrapper<DeviceModels> query = new EntityWrapper<>();
         if (ToolUtil.isNotEmpty(deviceType)) {
             query.eq(DEVICE_QUERY_DEVICE_TYPE, deviceType);
         }
+
         List<DeviceModels> list = deviceModelsService.selectList(query);
         List<DeviceSelectDto> selectDtos = new ArrayList<>();
         if (ToolUtil.isNotEmpty(list)) {
@@ -152,7 +153,9 @@
                 selectDtos.add(new DeviceSelectDto(deviceModels.getModelName(), deviceModels.getId(), deviceModels.getDeviceType()));
             });
         }
+
         return ResponseData.success(selectDtos);
+
     }
 
     @ApiOperation("批量导入设备")
@@ -168,16 +171,16 @@
         mapper.put("设备名称", "deviceName");
         //需要转换
         mapper.put("设备类型", "deviceTypeName");
-        //需要转换
         mapper.put("设备型号", "modelName");
-        //需要转换
         mapper.put("井编号", "wellCode");
-        //需要转换
         mapper.put("数据集中器编号", "concenCode");
+
         mapper.put("设备安装时间", "installDateFmt");
         mapper.put("网络类型", "networkType");
         mapper.put("通信协议", "protocol");
+        mapper.put("井权属单位名称", "deptName");
         try {
+
             try (InputStream in = file.getInputStream()) {
                 ExcelIO.read(in, mapper, Device.class, (row) -> {
                     //仅读取第一个sheet
@@ -199,17 +202,14 @@
                 });
 
                 List<String> list = deviceService.addDeviceBatch(results);
-
                 if (!ToolUtil.isEmpty(list)) {
                     //获取第校验报错信息
                     return new ErrorResponseData(list.get(0));
                 }
-
             }
         } catch (Exception e) {
             return catchMybatisPlusException(e, "导入设备失败");
         }
-
         return ResponseData.success();
     }
 
@@ -244,6 +244,7 @@
     @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class)
     @ResponseBody
     public Object add(@Valid Device device, BindingResult result) {
+
         if (result.hasErrors()) {
             return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage());
         }
@@ -263,10 +264,12 @@
             gunsException.setMessage(errorMsg);
             throw gunsException;
         }
+
         return ResponseData.success();
     }
 
     private ResponseData catchMybatisPlusException(Exception e, String errorMsg) {
+
         if (e instanceof GunsException) {
             GunsException guns = (GunsException) e;
             return ResponseData.success(guns.getCode(), guns.getMessage(), null);
@@ -277,6 +280,7 @@
                 return new ErrorResponseData("设备编号重复:" + message.replaceAll("Duplicate entry '", "").replaceAll("' for key 'DEVCODE'", ""));
             }
         }
+
         logger.error(errorMsg, e);
         return new ErrorResponseData(errorMsg);
     }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index 4ed73db..3059dd7 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -23,7 +23,7 @@
 
     List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("deptIds") List<Long> deptIds,@Param("isOnline") String isOnline, @Param("maxCell") float maxCell);
 
-    DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode);
+    DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode,@Param("deptId") String deptId);
 
     DeviceConcentratorDto selectDeviceConcentorByCode(@Param("concenCode") String concenCode);
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 655a57a..73a88cc 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -37,6 +37,7 @@
         FROM bus_well_info
         WHERE VALID = '1'
           AND WELL_CODE = #{wellCode}
+          AND DEPTID = #{deptId}
     </select>
 
     <select id="selectDeviceConcentorByCode" resultType="com.casic.missiles.modular.system.dto.DeviceConcentratorDto">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/Device.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/Device.java
index b8ad47d..d240286 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/model/Device.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/Device.java
@@ -108,6 +108,17 @@
     @TableField(exist = false)
     private String installDateFmt;
 
+    /**
+     * 井权属单位
+     */
+    @TableField(exist = false)
+    private String deptId;
+    /**
+     * 井权属单位 名称
+     */
+    @TableField(exist = false)
+    private String deptName;
+
     @Override
     protected Serializable pkVal() {
         return this.id;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
index 71eea35..a589497 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
@@ -39,7 +39,7 @@
      * @param wellCode
      * @return
      */
-    DeviceWellDto selectWellIdByCode(String wellCode);
+    DeviceWellDto selectWellIdByCode(String wellCode,String deptId);
 
 
     Device getDeviceByDevCode(String devCode);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index 60f445b..7aeef12 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.exception.GunsException;
 import com.casic.missiles.core.exception.GunsExceptionEnum;
+import com.casic.missiles.core.util.Convert;
 import com.casic.missiles.core.util.DateUtil;
 import com.casic.missiles.core.util.ToolUtil;
 import com.casic.missiles.modular.system.constant.DeviceConst;
@@ -39,6 +40,7 @@
 import java.io.Serializable;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -108,7 +110,7 @@
     @Override
     public boolean insert(Device entity) {
         //根据井编号查询井信息
-        DeviceWellDto wellDto = this.selectWellIdByCode(entity.getWellCode());
+        DeviceWellDto wellDto = this.selectWellIdByCode(entity.getWellCode(), entity.getDeptId());
         if (ToolUtil.isEmpty(wellDto)) {
             GunsException gunsException = new GunsException(GunsExceptionEnum.REQUEST_NULL);
             gunsException.setMessage("闸井编号不存在");
@@ -139,7 +141,7 @@
         entity.setSecretKey(secretKey);
         boolean flag = super.insert(entity);
 
-        //        insertSecretKey(entity.getDevcode(),true);
+        //insertSecretKey(entity.getDevcode(),true);
 
         //关联设备集中器信息
         if (isAddConcentrator) {
@@ -158,7 +160,7 @@
 
         //根据井编号查询井信息
         if (ToolUtil.isNotEmpty(entity.getWellCode())) {
-            DeviceWellDto wellDto = this.selectWellIdByCode(entity.getWellCode());
+            DeviceWellDto wellDto = this.selectWellIdByCode(entity.getWellCode(), entity.getDeptId());
             if (ToolUtil.isEmpty(wellDto)) {
                 GunsException gunsException = new GunsException(GunsExceptionEnum.REQUEST_NULL);
                 gunsException.setMessage("闸井编号不存在");
@@ -240,8 +242,8 @@
     }
 
     @Override
-    public DeviceWellDto selectWellIdByCode(String wellCode) {
-        return this.baseMapper.selectWellIdByCode(wellCode);
+    public DeviceWellDto selectWellIdByCode(String wellCode, String deptId) {
+        return this.baseMapper.selectWellIdByCode(wellCode, deptId);
     }
 
     @Override
@@ -260,31 +262,40 @@
     @Transactional
     @Override
     public List<String> addDeviceBatch(List<Device> results) {
+        //读取全部组织信息
+        List<Dept> deptList = permissionService.getAllDepts("");
+        Map<String, Dept> deptMaps = deptList.stream().collect(Collectors.toMap(Dept::getFullname, dept -> dept));
 
         BeanPropertyBindingResult beanPropertyBindingResult = new BeanPropertyBindingResult(Device.class, "设备类型导入校验");
         Map<String, Boolean> isAddConcentrator = new HashMap<>();
         List<String> list = new ArrayList<>();
+
         if (!ToolUtil.isEmpty(results)) {
             final Integer[] index = {0};
             StringBuilder wellInfoCodes = new StringBuilder();
             //--------------------------
-            results.forEach(device -> {
+            for (Device result : results) {
                 index[0]++;
                 //查询是否存在
-                DeviceWellDto wellDto = this.selectWellIdByCode(device.getWellCode());
+                Dept dept = deptMaps.get(result.getDeptName());
+                if (dept == null) {
+                    wellInfoCodes.append(index[0]).append(",");
+                    continue;
+                }
+                result.setDeptId(Convert.toStr(dept.getId()));
+                DeviceWellDto wellDto = this.selectWellIdByCode(result.getWellCode(), result.getDeptId());
                 if (ToolUtil.isOneEmpty(wellDto)) {
                     wellInfoCodes.append(index[0]).append(",");
                 }
-            });
+            }
             if (ToolUtil.isNotEmpty(wellInfoCodes.toString())) {
-                list.add("第" + wellInfoCodes.substring(0, wellInfoCodes.length() - 1) + "行,闸井编号不存在");
+                list.add("第" + wellInfoCodes.substring(0, wellInfoCodes.length() - 1) + "行,该组织下闸井编号不存在");
                 GunsException gunsException = new GunsException(BizExceptionEnum.OLD_PWD_NOT_RIGHT);
                 gunsException.setMessage(list.get(0));
                 throw gunsException;
-
             }
-            //--------------------------
 
+            //--------------------------
             index[0] = 0;
             results.forEach(device -> {
                 index[0]++;
@@ -306,7 +317,6 @@
                     return;
                 }
 
-
                 //设备型号校验
                 DeviceModels deviceModels = deviceModelsService.selectDeviceModelsBymodelName(device.getModelName());
                 if (ToolUtil.isEmpty(deviceModels)) {
@@ -317,14 +327,11 @@
                     list.add("第" + index[0] + "行,设备类型与设备型号不匹配");
                     return;
                 }
-
-
-                DeviceWellDto wellDto = this.selectWellIdByCode(device.getWellCode());
+                DeviceWellDto wellDto = this.selectWellIdByCode(device.getWellCode(), device.getDeptId());
                 if (ToolUtil.isOneEmpty(wellDto)) {
                     list.add("第" + index[0] + "行,闸井编号不存在");
                     return;
                 }
-
                 //如果非NB则判断集中器 即设备类型包含1
                 List<String> communis = Arrays.asList(deviceModels.getCommunication().split(","));
                 //优先判断设备类型配置
@@ -356,8 +363,7 @@
                 device.setModelId(deviceModels.getId());
                 device.setWellId(wellDto.getWellId());
                 device.setSecretKey(secretKey);
-
-                //                insertSecretKey(device.getDevcode(),true);
+                //insertSecretKey(device.getDevcode(),true);
             });
 
             if (ToolUtil.isNotEmpty(list)) {
diff --git a/casic-platform-sync/src/main/java/com/casic/missiles/modular/system/service/impl/SyncWellInfoServiceImpl.java b/casic-platform-sync/src/main/java/com/casic/missiles/modular/system/service/impl/SyncWellInfoServiceImpl.java
index 13be5ec..aa8e6da 100644
--- a/casic-platform-sync/src/main/java/com/casic/missiles/modular/system/service/impl/SyncWellInfoServiceImpl.java
+++ b/casic-platform-sync/src/main/java/com/casic/missiles/modular/system/service/impl/SyncWellInfoServiceImpl.java
@@ -72,12 +72,6 @@
         List<String> wellCodeList = busWellInfoService.getAllWellCode();
         for (BusSyncWellInfo busSyncWellInfo : list) {
             BusWellInfo busWellInfo = new BusWellInfo();
-            if (wellCodeList.contains(busSyncWellInfo.getWellCode().trim().toUpperCase())) {
-                //查询井信息
-                EntityWrapper query = new EntityWrapper();
-                query.eq("WELL_CODE", busSyncWellInfo.getWellCode().trim().toUpperCase());
-                busWellInfo = busWellInfoService.selectOne(query);
-            }
             //井对应orgcode不存在
             EntityWrapper codeQuery = new EntityWrapper();
             codeQuery.eq("ORG_CODE", busSyncWellInfo.getResponsibleDept());
@@ -89,16 +83,24 @@
             BusSyncOrgRelation busSyncOrgRelation = syncOrgRelationService.findRecursionPids(orgRelation.getOrgId(), 1);
             //查询运行所ID
             BusSyncOrgRelation resOrgRelation = syncOrgRelationService.findRecursionPids(orgRelation.getOrgId(), 2);
-
             //获取分公司对应id
             Dept dept = expandComponentService.getDeptByTargetId(busSyncOrgRelation.getOrgId(), null);
-            busWellInfo.setCompanyId(String.valueOf(dept.getId()));
             //获取运行所id
             Dept resDept = expandComponentService.getDeptByTargetId(resOrgRelation.getOrgId(), null);
+            if (wellCodeList.contains(busSyncWellInfo.getWellCode().trim().toUpperCase())) {
+                //查询井信息
+                EntityWrapper query = new EntityWrapper();
+                query.eq("WELL_CODE", busSyncWellInfo.getWellCode().trim().toUpperCase());
+                query.eq("deptid", resDept.getId());
+                busWellInfo = busWellInfoService.selectOne(query);
+            }
+
+            busWellInfo.setCompanyId(String.valueOf(dept.getId()));
+
             busWellInfo.setDeptid(String.valueOf(resDept.getId()));
             busWellInfo.setResponsibleDept(String.valueOf(resDept.getId()));
             //设置
-            //busWellInfo.setWellCode(busSyncWellInfo.getWellCode().trim().toUpperCase());
+            busWellInfo.setWellCode(busSyncWellInfo.getWellCode().trim().toUpperCase());
             busWellInfo.setWellName(busSyncWellInfo.getWellName().trim());
             busWellInfo.setDeep(busSyncWellInfo.getDeep());
             busWellInfo.setLatGaode(busSyncWellInfo.getLatGaode());
@@ -140,33 +142,21 @@
         List<BusSyncWellInfo> list = getWellsByBatchId(batchId);
         List<String> wellCodeList = busWellInfoService.getAllWellCode();
         //同步表中不存在井则进行废除
-
         jdbcTemplate.update("UPDATE bus_well_info SET VALID = '0' WHERE WELL_CODE NOT IN (SELECT WELL_CODE from bus_sync_well_info)");
 
         for (BusSyncWellInfo busSyncWellInfo : list) {
-
             //查询井信息所属运行所及所属公司
             BusWellInfo busWellInfo = new BusWellInfo();
-            if (wellCodeList.contains(busSyncWellInfo.getWellCode().trim().toUpperCase())) {
-//              EntityWrapper query = new EntityWrapper();
-//              query.eq("WELL_CODE", busSyncWellInfo.getWellCode().trim().toUpperCase());
-                busWellInfo = busWellInfoService.selectByCode(busSyncWellInfo.getWellCode().trim().toUpperCase(), null);
-            }
-
-            //井对应orgcode为空
-            if (ToolUtil.isEmpty(busSyncWellInfo.getResponsibleDept())) {
-                continue;
-            }
 
             EntityWrapper codeQuery = new EntityWrapper();
             codeQuery.eq("ORG_CODE", busSyncWellInfo.getResponsibleDept());
-
-            //井对应orgcode不存在
-            BusSyncOrgRelation orgRelation = syncOrgRelationService.selectOne(codeQuery);
-            if (orgRelation == null) {
-                continue;
-            }
             try {
+                //井对应orgcode不存在
+                BusSyncOrgRelation orgRelation = syncOrgRelationService.selectOne(codeQuery);
+                if (orgRelation == null) {
+                    continue;
+                }
+
                 //查询对应分公司ID
                 BusSyncOrgRelation busSyncOrgRelation = syncOrgRelationService.findRecursionPids(orgRelation.getOrgId(), new Integer(1));
                 //查询运行所ID
@@ -174,10 +164,24 @@
                 if (busSyncOrgRelation == null || resOrgRelation == null) {
                     continue;
                 }
+
+                //读取该井运行所ID
+                String deptId = busWellInfoService.getDeptIdByOrgCode(resOrgRelation.getOrgCode());
+                if (wellCodeList.contains(busSyncWellInfo.getWellCode().trim().toUpperCase())) {
+                    // EntityWrapper query = new EntityWrapper();
+                    //  query.eq("WELL_CODE", busSyncWellInfo.getWellCode().trim().toUpperCase());
+                    busWellInfo = busWellInfoService.selectByCode(busSyncWellInfo.getWellCode().trim().toUpperCase(),deptId, null);
+                }
+
+                //井对应orgcode为空
+                if (ToolUtil.isEmpty(busSyncWellInfo.getResponsibleDept())) {
+                    continue;
+                }
+
                 Dept dept = expandComponentService.getDeptByTargetId(busSyncOrgRelation.getOrgId(), null);
                 busWellInfo.setCompanyId(String.valueOf(dept.getId()));
                 //获取分公司对应id   修改为运行所
-                busWellInfo.setDeptid(busWellInfoService.getDeptIdByOrgCode(resOrgRelation.getOrgCode()));
+                busWellInfo.setDeptid(deptId);
                 //获取运行所id
                 busWellInfo.setResponsibleDept(busWellInfoService.getDeptIdByOrgCode(resOrgRelation.getOrgCode()));
                 busWellInfo.setWellCode(busSyncWellInfo.getWellCode().trim().toUpperCase());
@@ -189,15 +193,15 @@
                 busWellInfo.setWellType("3");
                 busWellInfo.setValid("1");
                 busWellInfoList.add(busWellInfo);
+
             } catch (Exception e) {
                 e.printStackTrace();
                 continue;
             }
-        }
 
+        }
         if (ToolUtil.isNotEmpty(busWellInfoList)) {
             busWellInfoService.insertOrUpdateBatch(busWellInfoList);
         }
     }
-
 }
\ No newline at end of file

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 63906f7..102e2a3 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -120,7 +120,6 @@
         return new SuccessResponseData(list);
     }
 
-
     @ApiOperation("获取设备类型列表")
     @GetMapping(value = "/type")
     @ResponseBody
@@ -140,11 +139,13 @@
     @GetMapping(value = "/model")
     @ResponseBody
     public Object model(String deviceType) {
+
         //设备类型列表查询
         EntityWrapper<DeviceModels> query = new EntityWrapper<>();
         if (ToolUtil.isNotEmpty(deviceType)) {
             query.eq(DEVICE_QUERY_DEVICE_TYPE, deviceType);
         }
+
         List<DeviceModels> list = deviceModelsService.selectList(query);
         List<DeviceSelectDto> selectDtos = new ArrayList<>();
         if (ToolUtil.isNotEmpty(list)) {
@@ -152,7 +153,9 @@
                 selectDtos.add(new DeviceSelectDto(deviceModels.getModelName(), deviceModels.getId(), deviceModels.getDeviceType()));
             });
         }
+
         return ResponseData.success(selectDtos);
+
     }
 
     @ApiOperation("批量导入设备")
@@ -168,16 +171,16 @@
         mapper.put("设备名称", "deviceName");
         //需要转换
         mapper.put("设备类型", "deviceTypeName");
-        //需要转换
         mapper.put("设备型号", "modelName");
-        //需要转换
         mapper.put("井编号", "wellCode");
-        //需要转换
         mapper.put("数据集中器编号", "concenCode");
+
         mapper.put("设备安装时间", "installDateFmt");
         mapper.put("网络类型", "networkType");
         mapper.put("通信协议", "protocol");
+        mapper.put("井权属单位名称", "deptName");
         try {
+
             try (InputStream in = file.getInputStream()) {
                 ExcelIO.read(in, mapper, Device.class, (row) -> {
                     //仅读取第一个sheet
@@ -199,17 +202,14 @@
                 });
 
                 List<String> list = deviceService.addDeviceBatch(results);
-
                 if (!ToolUtil.isEmpty(list)) {
                     //获取第校验报错信息
                     return new ErrorResponseData(list.get(0));
                 }
-
             }
         } catch (Exception e) {
             return catchMybatisPlusException(e, "导入设备失败");
         }
-
         return ResponseData.success();
     }
 
@@ -244,6 +244,7 @@
     @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class)
     @ResponseBody
     public Object add(@Valid Device device, BindingResult result) {
+
         if (result.hasErrors()) {
             return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage());
         }
@@ -263,10 +264,12 @@
             gunsException.setMessage(errorMsg);
             throw gunsException;
         }
+
         return ResponseData.success();
     }
 
     private ResponseData catchMybatisPlusException(Exception e, String errorMsg) {
+
         if (e instanceof GunsException) {
             GunsException guns = (GunsException) e;
             return ResponseData.success(guns.getCode(), guns.getMessage(), null);
@@ -277,6 +280,7 @@
                 return new ErrorResponseData("设备编号重复:" + message.replaceAll("Duplicate entry '", "").replaceAll("' for key 'DEVCODE'", ""));
             }
         }
+
         logger.error(errorMsg, e);
         return new ErrorResponseData(errorMsg);
     }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index 4ed73db..3059dd7 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -23,7 +23,7 @@
 
     List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("deptIds") List<Long> deptIds,@Param("isOnline") String isOnline, @Param("maxCell") float maxCell);
 
-    DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode);
+    DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode,@Param("deptId") String deptId);
 
     DeviceConcentratorDto selectDeviceConcentorByCode(@Param("concenCode") String concenCode);
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 655a57a..73a88cc 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -37,6 +37,7 @@
         FROM bus_well_info
         WHERE VALID = '1'
           AND WELL_CODE = #{wellCode}
+          AND DEPTID = #{deptId}
     </select>
 
     <select id="selectDeviceConcentorByCode" resultType="com.casic.missiles.modular.system.dto.DeviceConcentratorDto">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/Device.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/Device.java
index b8ad47d..d240286 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/model/Device.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/Device.java
@@ -108,6 +108,17 @@
     @TableField(exist = false)
     private String installDateFmt;
 
+    /**
+     * 井权属单位
+     */
+    @TableField(exist = false)
+    private String deptId;
+    /**
+     * 井权属单位 名称
+     */
+    @TableField(exist = false)
+    private String deptName;
+
     @Override
     protected Serializable pkVal() {
         return this.id;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
index 71eea35..a589497 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
@@ -39,7 +39,7 @@
      * @param wellCode
      * @return
      */
-    DeviceWellDto selectWellIdByCode(String wellCode);
+    DeviceWellDto selectWellIdByCode(String wellCode,String deptId);
 
 
     Device getDeviceByDevCode(String devCode);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index 60f445b..7aeef12 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.exception.GunsException;
 import com.casic.missiles.core.exception.GunsExceptionEnum;
+import com.casic.missiles.core.util.Convert;
 import com.casic.missiles.core.util.DateUtil;
 import com.casic.missiles.core.util.ToolUtil;
 import com.casic.missiles.modular.system.constant.DeviceConst;
@@ -39,6 +40,7 @@
 import java.io.Serializable;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -108,7 +110,7 @@
     @Override
     public boolean insert(Device entity) {
         //根据井编号查询井信息
-        DeviceWellDto wellDto = this.selectWellIdByCode(entity.getWellCode());
+        DeviceWellDto wellDto = this.selectWellIdByCode(entity.getWellCode(), entity.getDeptId());
         if (ToolUtil.isEmpty(wellDto)) {
             GunsException gunsException = new GunsException(GunsExceptionEnum.REQUEST_NULL);
             gunsException.setMessage("闸井编号不存在");
@@ -139,7 +141,7 @@
         entity.setSecretKey(secretKey);
         boolean flag = super.insert(entity);
 
-        //        insertSecretKey(entity.getDevcode(),true);
+        //insertSecretKey(entity.getDevcode(),true);
 
         //关联设备集中器信息
         if (isAddConcentrator) {
@@ -158,7 +160,7 @@
 
         //根据井编号查询井信息
         if (ToolUtil.isNotEmpty(entity.getWellCode())) {
-            DeviceWellDto wellDto = this.selectWellIdByCode(entity.getWellCode());
+            DeviceWellDto wellDto = this.selectWellIdByCode(entity.getWellCode(), entity.getDeptId());
             if (ToolUtil.isEmpty(wellDto)) {
                 GunsException gunsException = new GunsException(GunsExceptionEnum.REQUEST_NULL);
                 gunsException.setMessage("闸井编号不存在");
@@ -240,8 +242,8 @@
     }
 
     @Override
-    public DeviceWellDto selectWellIdByCode(String wellCode) {
-        return this.baseMapper.selectWellIdByCode(wellCode);
+    public DeviceWellDto selectWellIdByCode(String wellCode, String deptId) {
+        return this.baseMapper.selectWellIdByCode(wellCode, deptId);
     }
 
     @Override
@@ -260,31 +262,40 @@
     @Transactional
     @Override
     public List<String> addDeviceBatch(List<Device> results) {
+        //读取全部组织信息
+        List<Dept> deptList = permissionService.getAllDepts("");
+        Map<String, Dept> deptMaps = deptList.stream().collect(Collectors.toMap(Dept::getFullname, dept -> dept));
 
         BeanPropertyBindingResult beanPropertyBindingResult = new BeanPropertyBindingResult(Device.class, "设备类型导入校验");
         Map<String, Boolean> isAddConcentrator = new HashMap<>();
         List<String> list = new ArrayList<>();
+
         if (!ToolUtil.isEmpty(results)) {
             final Integer[] index = {0};
             StringBuilder wellInfoCodes = new StringBuilder();
             //--------------------------
-            results.forEach(device -> {
+            for (Device result : results) {
                 index[0]++;
                 //查询是否存在
-                DeviceWellDto wellDto = this.selectWellIdByCode(device.getWellCode());
+                Dept dept = deptMaps.get(result.getDeptName());
+                if (dept == null) {
+                    wellInfoCodes.append(index[0]).append(",");
+                    continue;
+                }
+                result.setDeptId(Convert.toStr(dept.getId()));
+                DeviceWellDto wellDto = this.selectWellIdByCode(result.getWellCode(), result.getDeptId());
                 if (ToolUtil.isOneEmpty(wellDto)) {
                     wellInfoCodes.append(index[0]).append(",");
                 }
-            });
+            }
             if (ToolUtil.isNotEmpty(wellInfoCodes.toString())) {
-                list.add("第" + wellInfoCodes.substring(0, wellInfoCodes.length() - 1) + "行,闸井编号不存在");
+                list.add("第" + wellInfoCodes.substring(0, wellInfoCodes.length() - 1) + "行,该组织下闸井编号不存在");
                 GunsException gunsException = new GunsException(BizExceptionEnum.OLD_PWD_NOT_RIGHT);
                 gunsException.setMessage(list.get(0));
                 throw gunsException;
-
             }
-            //--------------------------
 
+            //--------------------------
             index[0] = 0;
             results.forEach(device -> {
                 index[0]++;
@@ -306,7 +317,6 @@
                     return;
                 }
 
-
                 //设备型号校验
                 DeviceModels deviceModels = deviceModelsService.selectDeviceModelsBymodelName(device.getModelName());
                 if (ToolUtil.isEmpty(deviceModels)) {
@@ -317,14 +327,11 @@
                     list.add("第" + index[0] + "行,设备类型与设备型号不匹配");
                     return;
                 }
-
-
-                DeviceWellDto wellDto = this.selectWellIdByCode(device.getWellCode());
+                DeviceWellDto wellDto = this.selectWellIdByCode(device.getWellCode(), device.getDeptId());
                 if (ToolUtil.isOneEmpty(wellDto)) {
                     list.add("第" + index[0] + "行,闸井编号不存在");
                     return;
                 }
-
                 //如果非NB则判断集中器 即设备类型包含1
                 List<String> communis = Arrays.asList(deviceModels.getCommunication().split(","));
                 //优先判断设备类型配置
@@ -356,8 +363,7 @@
                 device.setModelId(deviceModels.getId());
                 device.setWellId(wellDto.getWellId());
                 device.setSecretKey(secretKey);
-
-                //                insertSecretKey(device.getDevcode(),true);
+                //insertSecretKey(device.getDevcode(),true);
             });
 
             if (ToolUtil.isNotEmpty(list)) {
diff --git a/casic-platform-sync/src/main/java/com/casic/missiles/modular/system/service/impl/SyncWellInfoServiceImpl.java b/casic-platform-sync/src/main/java/com/casic/missiles/modular/system/service/impl/SyncWellInfoServiceImpl.java
index 13be5ec..aa8e6da 100644
--- a/casic-platform-sync/src/main/java/com/casic/missiles/modular/system/service/impl/SyncWellInfoServiceImpl.java
+++ b/casic-platform-sync/src/main/java/com/casic/missiles/modular/system/service/impl/SyncWellInfoServiceImpl.java
@@ -72,12 +72,6 @@
         List<String> wellCodeList = busWellInfoService.getAllWellCode();
         for (BusSyncWellInfo busSyncWellInfo : list) {
             BusWellInfo busWellInfo = new BusWellInfo();
-            if (wellCodeList.contains(busSyncWellInfo.getWellCode().trim().toUpperCase())) {
-                //查询井信息
-                EntityWrapper query = new EntityWrapper();
-                query.eq("WELL_CODE", busSyncWellInfo.getWellCode().trim().toUpperCase());
-                busWellInfo = busWellInfoService.selectOne(query);
-            }
             //井对应orgcode不存在
             EntityWrapper codeQuery = new EntityWrapper();
             codeQuery.eq("ORG_CODE", busSyncWellInfo.getResponsibleDept());
@@ -89,16 +83,24 @@
             BusSyncOrgRelation busSyncOrgRelation = syncOrgRelationService.findRecursionPids(orgRelation.getOrgId(), 1);
             //查询运行所ID
             BusSyncOrgRelation resOrgRelation = syncOrgRelationService.findRecursionPids(orgRelation.getOrgId(), 2);
-
             //获取分公司对应id
             Dept dept = expandComponentService.getDeptByTargetId(busSyncOrgRelation.getOrgId(), null);
-            busWellInfo.setCompanyId(String.valueOf(dept.getId()));
             //获取运行所id
             Dept resDept = expandComponentService.getDeptByTargetId(resOrgRelation.getOrgId(), null);
+            if (wellCodeList.contains(busSyncWellInfo.getWellCode().trim().toUpperCase())) {
+                //查询井信息
+                EntityWrapper query = new EntityWrapper();
+                query.eq("WELL_CODE", busSyncWellInfo.getWellCode().trim().toUpperCase());
+                query.eq("deptid", resDept.getId());
+                busWellInfo = busWellInfoService.selectOne(query);
+            }
+
+            busWellInfo.setCompanyId(String.valueOf(dept.getId()));
+
             busWellInfo.setDeptid(String.valueOf(resDept.getId()));
             busWellInfo.setResponsibleDept(String.valueOf(resDept.getId()));
             //设置
-            //busWellInfo.setWellCode(busSyncWellInfo.getWellCode().trim().toUpperCase());
+            busWellInfo.setWellCode(busSyncWellInfo.getWellCode().trim().toUpperCase());
             busWellInfo.setWellName(busSyncWellInfo.getWellName().trim());
             busWellInfo.setDeep(busSyncWellInfo.getDeep());
             busWellInfo.setLatGaode(busSyncWellInfo.getLatGaode());
@@ -140,33 +142,21 @@
         List<BusSyncWellInfo> list = getWellsByBatchId(batchId);
         List<String> wellCodeList = busWellInfoService.getAllWellCode();
         //同步表中不存在井则进行废除
-
         jdbcTemplate.update("UPDATE bus_well_info SET VALID = '0' WHERE WELL_CODE NOT IN (SELECT WELL_CODE from bus_sync_well_info)");
 
         for (BusSyncWellInfo busSyncWellInfo : list) {
-
             //查询井信息所属运行所及所属公司
             BusWellInfo busWellInfo = new BusWellInfo();
-            if (wellCodeList.contains(busSyncWellInfo.getWellCode().trim().toUpperCase())) {
-//              EntityWrapper query = new EntityWrapper();
-//              query.eq("WELL_CODE", busSyncWellInfo.getWellCode().trim().toUpperCase());
-                busWellInfo = busWellInfoService.selectByCode(busSyncWellInfo.getWellCode().trim().toUpperCase(), null);
-            }
-
-            //井对应orgcode为空
-            if (ToolUtil.isEmpty(busSyncWellInfo.getResponsibleDept())) {
-                continue;
-            }
 
             EntityWrapper codeQuery = new EntityWrapper();
             codeQuery.eq("ORG_CODE", busSyncWellInfo.getResponsibleDept());
-
-            //井对应orgcode不存在
-            BusSyncOrgRelation orgRelation = syncOrgRelationService.selectOne(codeQuery);
-            if (orgRelation == null) {
-                continue;
-            }
             try {
+                //井对应orgcode不存在
+                BusSyncOrgRelation orgRelation = syncOrgRelationService.selectOne(codeQuery);
+                if (orgRelation == null) {
+                    continue;
+                }
+
                 //查询对应分公司ID
                 BusSyncOrgRelation busSyncOrgRelation = syncOrgRelationService.findRecursionPids(orgRelation.getOrgId(), new Integer(1));
                 //查询运行所ID
@@ -174,10 +164,24 @@
                 if (busSyncOrgRelation == null || resOrgRelation == null) {
                     continue;
                 }
+
+                //读取该井运行所ID
+                String deptId = busWellInfoService.getDeptIdByOrgCode(resOrgRelation.getOrgCode());
+                if (wellCodeList.contains(busSyncWellInfo.getWellCode().trim().toUpperCase())) {
+                    // EntityWrapper query = new EntityWrapper();
+                    //  query.eq("WELL_CODE", busSyncWellInfo.getWellCode().trim().toUpperCase());
+                    busWellInfo = busWellInfoService.selectByCode(busSyncWellInfo.getWellCode().trim().toUpperCase(),deptId, null);
+                }
+
+                //井对应orgcode为空
+                if (ToolUtil.isEmpty(busSyncWellInfo.getResponsibleDept())) {
+                    continue;
+                }
+
                 Dept dept = expandComponentService.getDeptByTargetId(busSyncOrgRelation.getOrgId(), null);
                 busWellInfo.setCompanyId(String.valueOf(dept.getId()));
                 //获取分公司对应id   修改为运行所
-                busWellInfo.setDeptid(busWellInfoService.getDeptIdByOrgCode(resOrgRelation.getOrgCode()));
+                busWellInfo.setDeptid(deptId);
                 //获取运行所id
                 busWellInfo.setResponsibleDept(busWellInfoService.getDeptIdByOrgCode(resOrgRelation.getOrgCode()));
                 busWellInfo.setWellCode(busSyncWellInfo.getWellCode().trim().toUpperCase());
@@ -189,15 +193,15 @@
                 busWellInfo.setWellType("3");
                 busWellInfo.setValid("1");
                 busWellInfoList.add(busWellInfo);
+
             } catch (Exception e) {
                 e.printStackTrace();
                 continue;
             }
-        }
 
+        }
         if (ToolUtil.isNotEmpty(busWellInfoList)) {
             busWellInfoService.insertOrUpdateBatch(busWellInfoList);
         }
     }
-
 }
\ No newline at end of file
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java
index 327215d..b5bd0c2 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java
@@ -72,5 +72,5 @@
      * @param valid
      * @return
      */
-    BusWellInfo selectByCode(String wellCode,String valid);
+    BusWellInfo selectByCode(String wellCode, String deptId,String valid);
 }

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 63906f7..102e2a3 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -120,7 +120,6 @@
         return new SuccessResponseData(list);
     }
 
-
     @ApiOperation("获取设备类型列表")
     @GetMapping(value = "/type")
     @ResponseBody
@@ -140,11 +139,13 @@
     @GetMapping(value = "/model")
     @ResponseBody
     public Object model(String deviceType) {
+
         //设备类型列表查询
         EntityWrapper<DeviceModels> query = new EntityWrapper<>();
         if (ToolUtil.isNotEmpty(deviceType)) {
             query.eq(DEVICE_QUERY_DEVICE_TYPE, deviceType);
         }
+
         List<DeviceModels> list = deviceModelsService.selectList(query);
         List<DeviceSelectDto> selectDtos = new ArrayList<>();
         if (ToolUtil.isNotEmpty(list)) {
@@ -152,7 +153,9 @@
                 selectDtos.add(new DeviceSelectDto(deviceModels.getModelName(), deviceModels.getId(), deviceModels.getDeviceType()));
             });
         }
+
         return ResponseData.success(selectDtos);
+
     }
 
     @ApiOperation("批量导入设备")
@@ -168,16 +171,16 @@
         mapper.put("设备名称", "deviceName");
         //需要转换
         mapper.put("设备类型", "deviceTypeName");
-        //需要转换
         mapper.put("设备型号", "modelName");
-        //需要转换
         mapper.put("井编号", "wellCode");
-        //需要转换
         mapper.put("数据集中器编号", "concenCode");
+
         mapper.put("设备安装时间", "installDateFmt");
         mapper.put("网络类型", "networkType");
         mapper.put("通信协议", "protocol");
+        mapper.put("井权属单位名称", "deptName");
         try {
+
             try (InputStream in = file.getInputStream()) {
                 ExcelIO.read(in, mapper, Device.class, (row) -> {
                     //仅读取第一个sheet
@@ -199,17 +202,14 @@
                 });
 
                 List<String> list = deviceService.addDeviceBatch(results);
-
                 if (!ToolUtil.isEmpty(list)) {
                     //获取第校验报错信息
                     return new ErrorResponseData(list.get(0));
                 }
-
             }
         } catch (Exception e) {
             return catchMybatisPlusException(e, "导入设备失败");
         }
-
         return ResponseData.success();
     }
 
@@ -244,6 +244,7 @@
     @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class)
     @ResponseBody
     public Object add(@Valid Device device, BindingResult result) {
+
         if (result.hasErrors()) {
             return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage());
         }
@@ -263,10 +264,12 @@
             gunsException.setMessage(errorMsg);
             throw gunsException;
         }
+
         return ResponseData.success();
     }
 
     private ResponseData catchMybatisPlusException(Exception e, String errorMsg) {
+
         if (e instanceof GunsException) {
             GunsException guns = (GunsException) e;
             return ResponseData.success(guns.getCode(), guns.getMessage(), null);
@@ -277,6 +280,7 @@
                 return new ErrorResponseData("设备编号重复:" + message.replaceAll("Duplicate entry '", "").replaceAll("' for key 'DEVCODE'", ""));
             }
         }
+
         logger.error(errorMsg, e);
         return new ErrorResponseData(errorMsg);
     }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index 4ed73db..3059dd7 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -23,7 +23,7 @@
 
     List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("deptIds") List<Long> deptIds,@Param("isOnline") String isOnline, @Param("maxCell") float maxCell);
 
-    DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode);
+    DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode,@Param("deptId") String deptId);
 
     DeviceConcentratorDto selectDeviceConcentorByCode(@Param("concenCode") String concenCode);
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 655a57a..73a88cc 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -37,6 +37,7 @@
         FROM bus_well_info
         WHERE VALID = '1'
           AND WELL_CODE = #{wellCode}
+          AND DEPTID = #{deptId}
     </select>
 
     <select id="selectDeviceConcentorByCode" resultType="com.casic.missiles.modular.system.dto.DeviceConcentratorDto">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/Device.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/Device.java
index b8ad47d..d240286 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/model/Device.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/Device.java
@@ -108,6 +108,17 @@
     @TableField(exist = false)
     private String installDateFmt;
 
+    /**
+     * 井权属单位
+     */
+    @TableField(exist = false)
+    private String deptId;
+    /**
+     * 井权属单位 名称
+     */
+    @TableField(exist = false)
+    private String deptName;
+
     @Override
     protected Serializable pkVal() {
         return this.id;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
index 71eea35..a589497 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
@@ -39,7 +39,7 @@
      * @param wellCode
      * @return
      */
-    DeviceWellDto selectWellIdByCode(String wellCode);
+    DeviceWellDto selectWellIdByCode(String wellCode,String deptId);
 
 
     Device getDeviceByDevCode(String devCode);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index 60f445b..7aeef12 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.exception.GunsException;
 import com.casic.missiles.core.exception.GunsExceptionEnum;
+import com.casic.missiles.core.util.Convert;
 import com.casic.missiles.core.util.DateUtil;
 import com.casic.missiles.core.util.ToolUtil;
 import com.casic.missiles.modular.system.constant.DeviceConst;
@@ -39,6 +40,7 @@
 import java.io.Serializable;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -108,7 +110,7 @@
     @Override
     public boolean insert(Device entity) {
         //根据井编号查询井信息
-        DeviceWellDto wellDto = this.selectWellIdByCode(entity.getWellCode());
+        DeviceWellDto wellDto = this.selectWellIdByCode(entity.getWellCode(), entity.getDeptId());
         if (ToolUtil.isEmpty(wellDto)) {
             GunsException gunsException = new GunsException(GunsExceptionEnum.REQUEST_NULL);
             gunsException.setMessage("闸井编号不存在");
@@ -139,7 +141,7 @@
         entity.setSecretKey(secretKey);
         boolean flag = super.insert(entity);
 
-        //        insertSecretKey(entity.getDevcode(),true);
+        //insertSecretKey(entity.getDevcode(),true);
 
         //关联设备集中器信息
         if (isAddConcentrator) {
@@ -158,7 +160,7 @@
 
         //根据井编号查询井信息
         if (ToolUtil.isNotEmpty(entity.getWellCode())) {
-            DeviceWellDto wellDto = this.selectWellIdByCode(entity.getWellCode());
+            DeviceWellDto wellDto = this.selectWellIdByCode(entity.getWellCode(), entity.getDeptId());
             if (ToolUtil.isEmpty(wellDto)) {
                 GunsException gunsException = new GunsException(GunsExceptionEnum.REQUEST_NULL);
                 gunsException.setMessage("闸井编号不存在");
@@ -240,8 +242,8 @@
     }
 
     @Override
-    public DeviceWellDto selectWellIdByCode(String wellCode) {
-        return this.baseMapper.selectWellIdByCode(wellCode);
+    public DeviceWellDto selectWellIdByCode(String wellCode, String deptId) {
+        return this.baseMapper.selectWellIdByCode(wellCode, deptId);
     }
 
     @Override
@@ -260,31 +262,40 @@
     @Transactional
     @Override
     public List<String> addDeviceBatch(List<Device> results) {
+        //读取全部组织信息
+        List<Dept> deptList = permissionService.getAllDepts("");
+        Map<String, Dept> deptMaps = deptList.stream().collect(Collectors.toMap(Dept::getFullname, dept -> dept));
 
         BeanPropertyBindingResult beanPropertyBindingResult = new BeanPropertyBindingResult(Device.class, "设备类型导入校验");
         Map<String, Boolean> isAddConcentrator = new HashMap<>();
         List<String> list = new ArrayList<>();
+
         if (!ToolUtil.isEmpty(results)) {
             final Integer[] index = {0};
             StringBuilder wellInfoCodes = new StringBuilder();
             //--------------------------
-            results.forEach(device -> {
+            for (Device result : results) {
                 index[0]++;
                 //查询是否存在
-                DeviceWellDto wellDto = this.selectWellIdByCode(device.getWellCode());
+                Dept dept = deptMaps.get(result.getDeptName());
+                if (dept == null) {
+                    wellInfoCodes.append(index[0]).append(",");
+                    continue;
+                }
+                result.setDeptId(Convert.toStr(dept.getId()));
+                DeviceWellDto wellDto = this.selectWellIdByCode(result.getWellCode(), result.getDeptId());
                 if (ToolUtil.isOneEmpty(wellDto)) {
                     wellInfoCodes.append(index[0]).append(",");
                 }
-            });
+            }
             if (ToolUtil.isNotEmpty(wellInfoCodes.toString())) {
-                list.add("第" + wellInfoCodes.substring(0, wellInfoCodes.length() - 1) + "行,闸井编号不存在");
+                list.add("第" + wellInfoCodes.substring(0, wellInfoCodes.length() - 1) + "行,该组织下闸井编号不存在");
                 GunsException gunsException = new GunsException(BizExceptionEnum.OLD_PWD_NOT_RIGHT);
                 gunsException.setMessage(list.get(0));
                 throw gunsException;
-
             }
-            //--------------------------
 
+            //--------------------------
             index[0] = 0;
             results.forEach(device -> {
                 index[0]++;
@@ -306,7 +317,6 @@
                     return;
                 }
 
-
                 //设备型号校验
                 DeviceModels deviceModels = deviceModelsService.selectDeviceModelsBymodelName(device.getModelName());
                 if (ToolUtil.isEmpty(deviceModels)) {
@@ -317,14 +327,11 @@
                     list.add("第" + index[0] + "行,设备类型与设备型号不匹配");
                     return;
                 }
-
-
-                DeviceWellDto wellDto = this.selectWellIdByCode(device.getWellCode());
+                DeviceWellDto wellDto = this.selectWellIdByCode(device.getWellCode(), device.getDeptId());
                 if (ToolUtil.isOneEmpty(wellDto)) {
                     list.add("第" + index[0] + "行,闸井编号不存在");
                     return;
                 }
-
                 //如果非NB则判断集中器 即设备类型包含1
                 List<String> communis = Arrays.asList(deviceModels.getCommunication().split(","));
                 //优先判断设备类型配置
@@ -356,8 +363,7 @@
                 device.setModelId(deviceModels.getId());
                 device.setWellId(wellDto.getWellId());
                 device.setSecretKey(secretKey);
-
-                //                insertSecretKey(device.getDevcode(),true);
+                //insertSecretKey(device.getDevcode(),true);
             });
 
             if (ToolUtil.isNotEmpty(list)) {
diff --git a/casic-platform-sync/src/main/java/com/casic/missiles/modular/system/service/impl/SyncWellInfoServiceImpl.java b/casic-platform-sync/src/main/java/com/casic/missiles/modular/system/service/impl/SyncWellInfoServiceImpl.java
index 13be5ec..aa8e6da 100644
--- a/casic-platform-sync/src/main/java/com/casic/missiles/modular/system/service/impl/SyncWellInfoServiceImpl.java
+++ b/casic-platform-sync/src/main/java/com/casic/missiles/modular/system/service/impl/SyncWellInfoServiceImpl.java
@@ -72,12 +72,6 @@
         List<String> wellCodeList = busWellInfoService.getAllWellCode();
         for (BusSyncWellInfo busSyncWellInfo : list) {
             BusWellInfo busWellInfo = new BusWellInfo();
-            if (wellCodeList.contains(busSyncWellInfo.getWellCode().trim().toUpperCase())) {
-                //查询井信息
-                EntityWrapper query = new EntityWrapper();
-                query.eq("WELL_CODE", busSyncWellInfo.getWellCode().trim().toUpperCase());
-                busWellInfo = busWellInfoService.selectOne(query);
-            }
             //井对应orgcode不存在
             EntityWrapper codeQuery = new EntityWrapper();
             codeQuery.eq("ORG_CODE", busSyncWellInfo.getResponsibleDept());
@@ -89,16 +83,24 @@
             BusSyncOrgRelation busSyncOrgRelation = syncOrgRelationService.findRecursionPids(orgRelation.getOrgId(), 1);
             //查询运行所ID
             BusSyncOrgRelation resOrgRelation = syncOrgRelationService.findRecursionPids(orgRelation.getOrgId(), 2);
-
             //获取分公司对应id
             Dept dept = expandComponentService.getDeptByTargetId(busSyncOrgRelation.getOrgId(), null);
-            busWellInfo.setCompanyId(String.valueOf(dept.getId()));
             //获取运行所id
             Dept resDept = expandComponentService.getDeptByTargetId(resOrgRelation.getOrgId(), null);
+            if (wellCodeList.contains(busSyncWellInfo.getWellCode().trim().toUpperCase())) {
+                //查询井信息
+                EntityWrapper query = new EntityWrapper();
+                query.eq("WELL_CODE", busSyncWellInfo.getWellCode().trim().toUpperCase());
+                query.eq("deptid", resDept.getId());
+                busWellInfo = busWellInfoService.selectOne(query);
+            }
+
+            busWellInfo.setCompanyId(String.valueOf(dept.getId()));
+
             busWellInfo.setDeptid(String.valueOf(resDept.getId()));
             busWellInfo.setResponsibleDept(String.valueOf(resDept.getId()));
             //设置
-            //busWellInfo.setWellCode(busSyncWellInfo.getWellCode().trim().toUpperCase());
+            busWellInfo.setWellCode(busSyncWellInfo.getWellCode().trim().toUpperCase());
             busWellInfo.setWellName(busSyncWellInfo.getWellName().trim());
             busWellInfo.setDeep(busSyncWellInfo.getDeep());
             busWellInfo.setLatGaode(busSyncWellInfo.getLatGaode());
@@ -140,33 +142,21 @@
         List<BusSyncWellInfo> list = getWellsByBatchId(batchId);
         List<String> wellCodeList = busWellInfoService.getAllWellCode();
         //同步表中不存在井则进行废除
-
         jdbcTemplate.update("UPDATE bus_well_info SET VALID = '0' WHERE WELL_CODE NOT IN (SELECT WELL_CODE from bus_sync_well_info)");
 
         for (BusSyncWellInfo busSyncWellInfo : list) {
-
             //查询井信息所属运行所及所属公司
             BusWellInfo busWellInfo = new BusWellInfo();
-            if (wellCodeList.contains(busSyncWellInfo.getWellCode().trim().toUpperCase())) {
-//              EntityWrapper query = new EntityWrapper();
-//              query.eq("WELL_CODE", busSyncWellInfo.getWellCode().trim().toUpperCase());
-                busWellInfo = busWellInfoService.selectByCode(busSyncWellInfo.getWellCode().trim().toUpperCase(), null);
-            }
-
-            //井对应orgcode为空
-            if (ToolUtil.isEmpty(busSyncWellInfo.getResponsibleDept())) {
-                continue;
-            }
 
             EntityWrapper codeQuery = new EntityWrapper();
             codeQuery.eq("ORG_CODE", busSyncWellInfo.getResponsibleDept());
-
-            //井对应orgcode不存在
-            BusSyncOrgRelation orgRelation = syncOrgRelationService.selectOne(codeQuery);
-            if (orgRelation == null) {
-                continue;
-            }
             try {
+                //井对应orgcode不存在
+                BusSyncOrgRelation orgRelation = syncOrgRelationService.selectOne(codeQuery);
+                if (orgRelation == null) {
+                    continue;
+                }
+
                 //查询对应分公司ID
                 BusSyncOrgRelation busSyncOrgRelation = syncOrgRelationService.findRecursionPids(orgRelation.getOrgId(), new Integer(1));
                 //查询运行所ID
@@ -174,10 +164,24 @@
                 if (busSyncOrgRelation == null || resOrgRelation == null) {
                     continue;
                 }
+
+                //读取该井运行所ID
+                String deptId = busWellInfoService.getDeptIdByOrgCode(resOrgRelation.getOrgCode());
+                if (wellCodeList.contains(busSyncWellInfo.getWellCode().trim().toUpperCase())) {
+                    // EntityWrapper query = new EntityWrapper();
+                    //  query.eq("WELL_CODE", busSyncWellInfo.getWellCode().trim().toUpperCase());
+                    busWellInfo = busWellInfoService.selectByCode(busSyncWellInfo.getWellCode().trim().toUpperCase(),deptId, null);
+                }
+
+                //井对应orgcode为空
+                if (ToolUtil.isEmpty(busSyncWellInfo.getResponsibleDept())) {
+                    continue;
+                }
+
                 Dept dept = expandComponentService.getDeptByTargetId(busSyncOrgRelation.getOrgId(), null);
                 busWellInfo.setCompanyId(String.valueOf(dept.getId()));
                 //获取分公司对应id   修改为运行所
-                busWellInfo.setDeptid(busWellInfoService.getDeptIdByOrgCode(resOrgRelation.getOrgCode()));
+                busWellInfo.setDeptid(deptId);
                 //获取运行所id
                 busWellInfo.setResponsibleDept(busWellInfoService.getDeptIdByOrgCode(resOrgRelation.getOrgCode()));
                 busWellInfo.setWellCode(busSyncWellInfo.getWellCode().trim().toUpperCase());
@@ -189,15 +193,15 @@
                 busWellInfo.setWellType("3");
                 busWellInfo.setValid("1");
                 busWellInfoList.add(busWellInfo);
+
             } catch (Exception e) {
                 e.printStackTrace();
                 continue;
             }
-        }
 
+        }
         if (ToolUtil.isNotEmpty(busWellInfoList)) {
             busWellInfoService.insertOrUpdateBatch(busWellInfoList);
         }
     }
-
 }
\ No newline at end of file
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java
index 327215d..b5bd0c2 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java
@@ -72,5 +72,5 @@
      * @param valid
      * @return
      */
-    BusWellInfo selectByCode(String wellCode,String valid);
+    BusWellInfo selectByCode(String wellCode, String deptId,String valid);
 }
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
index 767181e..8f5e8d5 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
@@ -440,9 +440,7 @@
                     convertCoordinates = Utility.convertGaodeAPI(gpsCoordinates);
                 }
 
-                if (ToolUtil.isNotEmpty(convertCoordinates) &&
-                        results.size() == convertCoordinates.size()) {
-
+                if (ToolUtil.isNotEmpty(convertCoordinates) && results.size() == convertCoordinates.size()) {
                     if ("baidu".equals(coordinate)) {
                         for (int i = 0; i < convertCoordinates.size(); i++) {
                             String[] xy = convertCoordinates.get(i).split(",");
@@ -490,7 +488,6 @@
     @Transactional
     @Override
     public void updateBatchBfcf(String keywords, String wellType, String deptid, String bfzt, List<Long> deptIds) {
-
         this.baseMapper.updateBatchBfcf(keywords, wellType, deptid, bfzt, deptIds);
     }
 
@@ -560,16 +557,19 @@
 
     @Override
     public BusWellInfo selectByCode(String wellCode) {
-        return selectByCode(wellCode, "1");
+        return selectByCode(wellCode,null, "1");
     }
 
     @Override
-    public BusWellInfo selectByCode(String wellCode, String valid) {
+    public BusWellInfo selectByCode(String wellCode, String deptId, String valid) {
         EntityWrapper query = new EntityWrapper();
         query.eq("WELL_CODE", wellCode);
         if (ToolUtil.isNotEmpty(valid)) {
             query.eq("VALID", "1");
         }
+        if (ToolUtil.isNotEmpty(deptId)) {
+            query.eq("DEPTID", deptId);
+        }
         BusWellInfo busWellInfo = this.selectOne(query);
         if (ToolUtil.isNotEmpty(busWellInfo)) {
             BusWellInfo detail = this.selectById(busWellInfo.getId());