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 b0136dc..9ff9f27 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
@@ -88,7 +88,6 @@
         Page<DeviceDto> page = new PageFactory<DeviceDto>().defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getCurrUserDataScope();
-        areaId += "%";
         List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline, areaId);
         list.forEach(deviceDto -> {
             deviceDto.setOnlineStateName(permissionService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState()));

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 b0136dc..9ff9f27 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
@@ -88,7 +88,6 @@
         Page<DeviceDto> page = new PageFactory<DeviceDto>().defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getCurrUserDataScope();
-        areaId += "%";
         List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline, areaId);
         list.forEach(deviceDto -> {
             deviceDto.setOnlineStateName(permissionService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState()));
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 83d2ec9..2ed6312 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
@@ -434,7 +434,7 @@
     public String getAreaFullNameById(String area) {
         String fullName = this.baseMapper.getArea(area);
         String pid = this.baseMapper.getAreaPId(area);
-        if (!pid.equals("0")) {
+        if (null != pid && !pid.equals("0")) {
             fullName = getAreaFullNameById(pid) + "/" + fullName;
         }
         return fullName;