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 3a08419..7eaea2c 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
@@ -78,7 +78,7 @@
      */
     void updateAllJobGenerationType(String jobGenerationType);
 
-    Map<String,Object> selectDeviceDetail(@Param("deviceId")Serializable deviceId);
+    List<Map<String,Object>> selectDeviceDetail(@Param("deviceId")Serializable deviceId);
 
     List<Map<String,String>> selectDept3List();
 

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 3a08419..7eaea2c 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
@@ -78,7 +78,7 @@
      */
     void updateAllJobGenerationType(String jobGenerationType);
 
-    Map<String,Object> selectDeviceDetail(@Param("deviceId")Serializable deviceId);
+    List<Map<String,Object>> selectDeviceDetail(@Param("deviceId")Serializable deviceId);
 
     List<Map<String,String>> selectDept3List();
 
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 47745f0..38f32ee 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
@@ -44,7 +44,6 @@
         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">
         SELECT id, CONCENCODE
@@ -968,7 +967,8 @@
                bd.INSTALL_DATE AS installDate,
                bd.NETWORK_TYPE AS networkType,
                bd.PROTOCOL     AS protocol,
-               bd.INSTALL_DATE AS installDate
+               bd.INSTALL_DATE AS installDate,
+               bwi.id as wellId
         FROM `bus_device` bd
                  LEFT JOIN bus_device_well bdw ON (bd.ID = bdw.DEVICE_ID and bdw.VALID = '1')
                  LEFT JOIN bus_well_info bwi ON (bdw.WELL_ID = bwi.ID and bwi.VALID = '1')

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 3a08419..7eaea2c 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
@@ -78,7 +78,7 @@
      */
     void updateAllJobGenerationType(String jobGenerationType);
 
-    Map<String,Object> selectDeviceDetail(@Param("deviceId")Serializable deviceId);
+    List<Map<String,Object>> selectDeviceDetail(@Param("deviceId")Serializable deviceId);
 
     List<Map<String,String>> selectDept3List();
 
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 47745f0..38f32ee 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
@@ -44,7 +44,6 @@
         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">
         SELECT id, CONCENCODE
@@ -968,7 +967,8 @@
                bd.INSTALL_DATE AS installDate,
                bd.NETWORK_TYPE AS networkType,
                bd.PROTOCOL     AS protocol,
-               bd.INSTALL_DATE AS installDate
+               bd.INSTALL_DATE AS installDate,
+               bwi.id as wellId
         FROM `bus_device` bd
                  LEFT JOIN bus_device_well bdw ON (bd.ID = bdw.DEVICE_ID and bdw.VALID = '1')
                  LEFT JOIN bus_well_info bwi ON (bdw.WELL_ID = bwi.ID and bwi.VALID = '1')
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 8558601..8921e36 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
@@ -28,6 +28,7 @@
 import com.casic.missiles.util.SecurityUtil;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
@@ -298,20 +299,16 @@
         if (!ToolUtil.isEmpty(results)) {
             final Integer[] index = {0};
             StringBuilder wellInfoCodes = new StringBuilder();
+
             //--------------------------
             for (Device result : results) {
                 index[0]++;
                 //查询是否存在
-                Dept dept = deptMaps.get(result.getDeptId());
-                if (dept == null) {
+                List<DeviceWellDto> wellDtos = this.selectWellIdByCode(result.getWellCode());
+                if (ToolUtil.isEmpty(wellDtos)) {
                     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) + "行,该组织下闸井编号不存在");
@@ -352,11 +349,11 @@
                     list.add("第" + index[0] + "行,设备类型与设备型号不匹配");
                     return;
                 }
-                DeviceWellDto wellDto = this.selectWellIdByCode(device.getWellCode(), device.getDeptId());
-                if (ToolUtil.isOneEmpty(wellDto)) {
-                    list.add("第" + index[0] + "行,闸井编号不存在");
-                    return;
-                }
+//                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(","));
                 //优先判断设备类型配置
@@ -386,7 +383,7 @@
                 //设置设备相关信息
                 device.setDeviceType(deviceType.getId());
                 device.setModelId(deviceModels.getId());
-                device.setWellId(wellDto.getWellId());
+//                device.setWellId(wellDto.getWellId());
                 device.setSecretKey(secretKey);
                 //insertSecretKey(device.getDevcode(),true);
             });
@@ -400,8 +397,10 @@
             List<DeviceWell> deviceWells = new ArrayList<>();
 
             results.forEach(device -> {
-                deviceWells.add(createDeviceWell(device.getId(), device.getWellId()));
-
+                List<DeviceWellDto> wellDtos = this.selectWellIdByCode(device.getWellCode());
+                for (DeviceWellDto wellDto : wellDtos) {
+                    deviceWells.add(createDeviceWell(device.getId(), wellDto.getWellId()));
+                }
                 //判断是否关联集中器
                 if (isAddConcentrator.get(device.getDevcode())) {
                     deviceConcentrators.add(createConcentrator(device.getId(), device.getConcenId()));
@@ -667,19 +666,29 @@
 
     @Override
     public Map<String, Object> selectDeviceDetail(Serializable deviceId) {
-        Map<String, Object> detail = this.baseMapper.selectDeviceDetail(deviceId);
-        if (ToolUtil.isNotEmpty(detail)) {
-            BusWellInfo wellInfo = busWellInfoService.selectByCode(detail.get("wellCode").toString());
-            if (ToolUtil.isNotEmpty(wellInfo)) {
-                detail.put("deptName", wellInfo.getDeptName());
-                detail.put("companyName", wellInfo.getCompanyName());
-                detail.put("coordinateX", wellInfo.getCoordinateX());
-                detail.put("coordinateY", wellInfo.getCoordinateY());
-                detail.put("areaName", wellInfo.getAreaName());
-                detail.put("quName", wellInfo.getQuName());
-                detail.put("position", wellInfo.getPosition());
+        Map<String, Object> detail = new HashMap<>();
+        List<Map<String, Object>> details = this.baseMapper.selectDeviceDetail(deviceId);
+        if(ToolUtil.isNotEmpty(details)){
+            List<String> deptNames = new ArrayList<>();
+            for (Map<String, Object> map : details) {
+                detail = map;
+                BusWellInfo wellInfo = busWellInfoService.selectById(map.get("wellId").toString());
+                if (ToolUtil.isNotEmpty(wellInfo)) {
+                    deptNames.add(wellInfo.getDeptName());
+                    detail.put("deptName", wellInfo.getDeptName());
+                    detail.put("companyName", wellInfo.getCompanyName());
+                    detail.put("coordinateX", wellInfo.getCoordinateX());
+                    detail.put("coordinateY", wellInfo.getCoordinateY());
+                    detail.put("areaName", wellInfo.getAreaName());
+                    detail.put("quName", wellInfo.getQuName());
+                    detail.put("position", wellInfo.getPosition());
+                }
             }
+
+            //设置井权属
+            detail.put("deptName",StringUtils.join(deptNames,","));
         }
+
         return detail;
     }