diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceModelsController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceModelsController.java
index 89a58da..710f96d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceModelsController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceModelsController.java
@@ -40,7 +40,7 @@
     private IBaseDeviceModelsService deviceModelsService;
 
     @ApiOperation("设备类型获取设备型号")
-    @PostMapping("/model")
+    @GetMapping("/model")
     public ReturnDTO<List<DeviceSelectDto>> model(String deviceType) {
         //设备类型列表查询
         QueryWrapper<BaseDeviceModels> query = new QueryWrapper<>();

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceModelsController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceModelsController.java
index 89a58da..710f96d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceModelsController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceModelsController.java
@@ -40,7 +40,7 @@
     private IBaseDeviceModelsService deviceModelsService;
 
     @ApiOperation("设备类型获取设备型号")
-    @PostMapping("/model")
+    @GetMapping("/model")
     public ReturnDTO<List<DeviceSelectDto>> model(String deviceType) {
         //设备类型列表查询
         QueryWrapper<BaseDeviceModels> query = new QueryWrapper<>();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java
index 2b2b464..3f0c56f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java
@@ -81,9 +81,11 @@
 
             // 查询最新数据和时间
             String latestTime = noiseService.getLatestNoiseDateTime(deviceDto.getDevcode());
-            Noise latest = noiseService.getLatestNoiseData(deviceDto.getDevcode(), latestTime);
-            deviceDto.setLatestData(latest.getDdata());
-            deviceDto.setLatestTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(latest.getUptime()));
+            if (latestTime != null) {
+                Noise latest = noiseService.getLatestNoiseData(deviceDto.getDevcode(), latestTime);
+                deviceDto.setLatestData(latest.getDdata());
+                deviceDto.setLatestTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(latest.getUptime()));
+            }
         });
         page.setRecords(list);
         return ReturnUtil.success(super.packForBT(page));

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceModelsController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceModelsController.java
index 89a58da..710f96d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceModelsController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceModelsController.java
@@ -40,7 +40,7 @@
     private IBaseDeviceModelsService deviceModelsService;
 
     @ApiOperation("设备类型获取设备型号")
-    @PostMapping("/model")
+    @GetMapping("/model")
     public ReturnDTO<List<DeviceSelectDto>> model(String deviceType) {
         //设备类型列表查询
         QueryWrapper<BaseDeviceModels> query = new QueryWrapper<>();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java
index 2b2b464..3f0c56f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java
@@ -81,9 +81,11 @@
 
             // 查询最新数据和时间
             String latestTime = noiseService.getLatestNoiseDateTime(deviceDto.getDevcode());
-            Noise latest = noiseService.getLatestNoiseData(deviceDto.getDevcode(), latestTime);
-            deviceDto.setLatestData(latest.getDdata());
-            deviceDto.setLatestTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(latest.getUptime()));
+            if (latestTime != null) {
+                Noise latest = noiseService.getLatestNoiseData(deviceDto.getDevcode(), latestTime);
+                deviceDto.setLatestData(latest.getDdata());
+                deviceDto.setLatestTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(latest.getUptime()));
+            }
         });
         page.setRecords(list);
         return ReturnUtil.success(super.packForBT(page));
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
index c31a32b..db262e1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
@@ -219,7 +219,17 @@
     @ApiOperation("获取点位下拉列表")
     @PostMapping("/selectList")
     public ReturnDTO<List<DeviceSelectDto>> selectList() {
-        List<DeviceSelectDto> list = iBusWellInfoService.selectList();
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        Set<String> roleTipes = permissionService.getAuthService().getLoginUser().getRoleTips();
+        if (roleTipes.contains("leader") || roleTipes.contains("member")) {
+            dataScope.setScopeName("responsible_dept");
+            List<Long> responsibleDeptIds = new ArrayList<>();
+            responsibleDeptIds.add(permissionService.getAuthService().getLoginUser().getDeptId());
+            dataScope.setDeptIds(responsibleDeptIds);
+        }
+
+        List<DeviceSelectDto> list = iBusWellInfoService.selectList(dataScope);
         return ReturnUtil.success(list);
     }
 

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceModelsController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceModelsController.java
index 89a58da..710f96d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceModelsController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceModelsController.java
@@ -40,7 +40,7 @@
     private IBaseDeviceModelsService deviceModelsService;
 
     @ApiOperation("设备类型获取设备型号")
-    @PostMapping("/model")
+    @GetMapping("/model")
     public ReturnDTO<List<DeviceSelectDto>> model(String deviceType) {
         //设备类型列表查询
         QueryWrapper<BaseDeviceModels> query = new QueryWrapper<>();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java
index 2b2b464..3f0c56f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java
@@ -81,9 +81,11 @@
 
             // 查询最新数据和时间
             String latestTime = noiseService.getLatestNoiseDateTime(deviceDto.getDevcode());
-            Noise latest = noiseService.getLatestNoiseData(deviceDto.getDevcode(), latestTime);
-            deviceDto.setLatestData(latest.getDdata());
-            deviceDto.setLatestTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(latest.getUptime()));
+            if (latestTime != null) {
+                Noise latest = noiseService.getLatestNoiseData(deviceDto.getDevcode(), latestTime);
+                deviceDto.setLatestData(latest.getDdata());
+                deviceDto.setLatestTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(latest.getUptime()));
+            }
         });
         page.setRecords(list);
         return ReturnUtil.success(super.packForBT(page));
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
index c31a32b..db262e1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
@@ -219,7 +219,17 @@
     @ApiOperation("获取点位下拉列表")
     @PostMapping("/selectList")
     public ReturnDTO<List<DeviceSelectDto>> selectList() {
-        List<DeviceSelectDto> list = iBusWellInfoService.selectList();
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        Set<String> roleTipes = permissionService.getAuthService().getLoginUser().getRoleTips();
+        if (roleTipes.contains("leader") || roleTipes.contains("member")) {
+            dataScope.setScopeName("responsible_dept");
+            List<Long> responsibleDeptIds = new ArrayList<>();
+            responsibleDeptIds.add(permissionService.getAuthService().getLoginUser().getDeptId());
+            dataScope.setDeptIds(responsibleDeptIds);
+        }
+
+        List<DeviceSelectDto> list = iBusWellInfoService.selectList(dataScope);
         return ReturnUtil.success(list);
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
index 845fff9..cdd8b06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
@@ -44,7 +44,7 @@
     List<WellRelationDto> getWellRelationDto( @Param("devCode") String devCode);
 
     @Select("SELECT id as value,  bi.WELL_CODE as name from bus_well_info bi where bi.VALID=1 order by 1 desc")
-    List<DeviceSelectDto> selectList();
+    List<DeviceSelectDto> selectList(@Param("scope") DataScope dataScope);
 
 
 }

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceModelsController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceModelsController.java
index 89a58da..710f96d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceModelsController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceModelsController.java
@@ -40,7 +40,7 @@
     private IBaseDeviceModelsService deviceModelsService;
 
     @ApiOperation("设备类型获取设备型号")
-    @PostMapping("/model")
+    @GetMapping("/model")
     public ReturnDTO<List<DeviceSelectDto>> model(String deviceType) {
         //设备类型列表查询
         QueryWrapper<BaseDeviceModels> query = new QueryWrapper<>();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java
index 2b2b464..3f0c56f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java
@@ -81,9 +81,11 @@
 
             // 查询最新数据和时间
             String latestTime = noiseService.getLatestNoiseDateTime(deviceDto.getDevcode());
-            Noise latest = noiseService.getLatestNoiseData(deviceDto.getDevcode(), latestTime);
-            deviceDto.setLatestData(latest.getDdata());
-            deviceDto.setLatestTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(latest.getUptime()));
+            if (latestTime != null) {
+                Noise latest = noiseService.getLatestNoiseData(deviceDto.getDevcode(), latestTime);
+                deviceDto.setLatestData(latest.getDdata());
+                deviceDto.setLatestTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(latest.getUptime()));
+            }
         });
         page.setRecords(list);
         return ReturnUtil.success(super.packForBT(page));
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
index c31a32b..db262e1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
@@ -219,7 +219,17 @@
     @ApiOperation("获取点位下拉列表")
     @PostMapping("/selectList")
     public ReturnDTO<List<DeviceSelectDto>> selectList() {
-        List<DeviceSelectDto> list = iBusWellInfoService.selectList();
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        Set<String> roleTipes = permissionService.getAuthService().getLoginUser().getRoleTips();
+        if (roleTipes.contains("leader") || roleTipes.contains("member")) {
+            dataScope.setScopeName("responsible_dept");
+            List<Long> responsibleDeptIds = new ArrayList<>();
+            responsibleDeptIds.add(permissionService.getAuthService().getLoginUser().getDeptId());
+            dataScope.setDeptIds(responsibleDeptIds);
+        }
+
+        List<DeviceSelectDto> list = iBusWellInfoService.selectList(dataScope);
         return ReturnUtil.success(list);
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
index 845fff9..cdd8b06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
@@ -44,7 +44,7 @@
     List<WellRelationDto> getWellRelationDto( @Param("devCode") String devCode);
 
     @Select("SELECT id as value,  bi.WELL_CODE as name from bus_well_info bi where bi.VALID=1 order by 1 desc")
-    List<DeviceSelectDto> selectList();
+    List<DeviceSelectDto> selectList(@Param("scope") DataScope dataScope);
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java
index 9bace18..efbbac5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java
@@ -30,7 +30,7 @@
 
     WellRelationDto getWellRelationDto(String devCode);
 
-    List<DeviceSelectDto>   selectList();
+    List<DeviceSelectDto>   selectList(DataScope dataScope);
 
 
 }

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceModelsController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceModelsController.java
index 89a58da..710f96d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceModelsController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BaseDeviceModelsController.java
@@ -40,7 +40,7 @@
     private IBaseDeviceModelsService deviceModelsService;
 
     @ApiOperation("设备类型获取设备型号")
-    @PostMapping("/model")
+    @GetMapping("/model")
     public ReturnDTO<List<DeviceSelectDto>> model(String deviceType) {
         //设备类型列表查询
         QueryWrapper<BaseDeviceModels> query = new QueryWrapper<>();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java
index 2b2b464..3f0c56f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDeviceController.java
@@ -81,9 +81,11 @@
 
             // 查询最新数据和时间
             String latestTime = noiseService.getLatestNoiseDateTime(deviceDto.getDevcode());
-            Noise latest = noiseService.getLatestNoiseData(deviceDto.getDevcode(), latestTime);
-            deviceDto.setLatestData(latest.getDdata());
-            deviceDto.setLatestTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(latest.getUptime()));
+            if (latestTime != null) {
+                Noise latest = noiseService.getLatestNoiseData(deviceDto.getDevcode(), latestTime);
+                deviceDto.setLatestData(latest.getDdata());
+                deviceDto.setLatestTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(latest.getUptime()));
+            }
         });
         page.setRecords(list);
         return ReturnUtil.success(super.packForBT(page));
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
index c31a32b..db262e1 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
@@ -219,7 +219,17 @@
     @ApiOperation("获取点位下拉列表")
     @PostMapping("/selectList")
     public ReturnDTO<List<DeviceSelectDto>> selectList() {
-        List<DeviceSelectDto> list = iBusWellInfoService.selectList();
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        Set<String> roleTipes = permissionService.getAuthService().getLoginUser().getRoleTips();
+        if (roleTipes.contains("leader") || roleTipes.contains("member")) {
+            dataScope.setScopeName("responsible_dept");
+            List<Long> responsibleDeptIds = new ArrayList<>();
+            responsibleDeptIds.add(permissionService.getAuthService().getLoginUser().getDeptId());
+            dataScope.setDeptIds(responsibleDeptIds);
+        }
+
+        List<DeviceSelectDto> list = iBusWellInfoService.selectList(dataScope);
         return ReturnUtil.success(list);
     }
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
index 845fff9..cdd8b06 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
@@ -44,7 +44,7 @@
     List<WellRelationDto> getWellRelationDto( @Param("devCode") String devCode);
 
     @Select("SELECT id as value,  bi.WELL_CODE as name from bus_well_info bi where bi.VALID=1 order by 1 desc")
-    List<DeviceSelectDto> selectList();
+    List<DeviceSelectDto> selectList(@Param("scope") DataScope dataScope);
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java
index 9bace18..efbbac5 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java
@@ -30,7 +30,7 @@
 
     WellRelationDto getWellRelationDto(String devCode);
 
-    List<DeviceSelectDto>   selectList();
+    List<DeviceSelectDto>   selectList(DataScope dataScope);
 
 
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
index 88c9efa..921d225 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
@@ -204,7 +204,7 @@
     }
 
     @Override
-    public List<DeviceSelectDto> selectList() {
-        return this.baseMapper.selectList();
+    public List<DeviceSelectDto> selectList(DataScope dataScope) {
+        return this.baseMapper.selectList(dataScope);
     }
 }