diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
index 50bf88e..bd5489a 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
@@ -50,7 +50,7 @@
     private String uptime;
     @ExcelProperty("电量（%）")
     private String cell;
-    @ExcelProperty("气体浓度（%VOL）")
+    @ExcelProperty("气体浓度（%LEL）")
     private String strength;
     private String logtime;
 }

diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
index 50bf88e..bd5489a 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
@@ -50,7 +50,7 @@
     private String uptime;
     @ExcelProperty("电量（%）")
     private String cell;
-    @ExcelProperty("气体浓度（%VOL）")
+    @ExcelProperty("气体浓度（%LEL）")
     private String strength;
     private String logtime;
 }
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java
index 78ac53e..89a80e5 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java
@@ -36,7 +36,7 @@
     private String uptime;
     @ExcelProperty("电量（%）")
     private String cell;
-    @ExcelProperty("燃气/液位值")
+    @ExcelProperty("燃气浓度（%LEL）")
     private String data;
     @ExcelProperty("记录时间")
     private String logtime;

diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
index 50bf88e..bd5489a 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
@@ -50,7 +50,7 @@
     private String uptime;
     @ExcelProperty("电量（%）")
     private String cell;
-    @ExcelProperty("气体浓度（%VOL）")
+    @ExcelProperty("气体浓度（%LEL）")
     private String strength;
     private String logtime;
 }
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java
index 78ac53e..89a80e5 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java
@@ -36,7 +36,7 @@
     private String uptime;
     @ExcelProperty("电量（%）")
     private String cell;
-    @ExcelProperty("燃气/液位值")
+    @ExcelProperty("燃气浓度（%LEL）")
     private String data;
     @ExcelProperty("记录时间")
     private String logtime;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/TenantDeptController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/TenantDeptController.java
index e07d75b..e5f3bfa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/TenantDeptController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/TenantDeptController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.model.Tenant;
 import com.casic.missiles.modular.system.model.TenantDept;
 import com.casic.missiles.modular.system.service.ITenantDeptService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -42,10 +43,11 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object list(String tenantName) {
-        Long   deptId=permissionService.getAuthService().getLoginUser().getDeptId();
+        tenantName = StringUtils.isEmpty(tenantName) ? "":tenantName;
+        Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
         QueryWrapper<Tenant> query = new QueryWrapper<>();
         query.like("tenant_name", tenantName);
-        List<TenantDTO> list = tenantDeptService.tenantList(query,deptId);
+        List<TenantDTO> list = tenantDeptService.tenantList(query, deptId);
         return ResponseData.success(list);
     }
 

diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
index 50bf88e..bd5489a 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
@@ -50,7 +50,7 @@
     private String uptime;
     @ExcelProperty("电量（%）")
     private String cell;
-    @ExcelProperty("气体浓度（%VOL）")
+    @ExcelProperty("气体浓度（%LEL）")
     private String strength;
     private String logtime;
 }
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java
index 78ac53e..89a80e5 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java
@@ -36,7 +36,7 @@
     private String uptime;
     @ExcelProperty("电量（%）")
     private String cell;
-    @ExcelProperty("燃气/液位值")
+    @ExcelProperty("燃气浓度（%LEL）")
     private String data;
     @ExcelProperty("记录时间")
     private String logtime;
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/TenantDeptController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/TenantDeptController.java
index e07d75b..e5f3bfa 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/TenantDeptController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/TenantDeptController.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.modular.system.model.Tenant;
 import com.casic.missiles.modular.system.model.TenantDept;
 import com.casic.missiles.modular.system.service.ITenantDeptService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -42,10 +43,11 @@
     @RequestMapping(value = "/list")
     @ResponseBody
     public Object list(String tenantName) {
-        Long   deptId=permissionService.getAuthService().getLoginUser().getDeptId();
+        tenantName = StringUtils.isEmpty(tenantName) ? "":tenantName;
+        Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
         QueryWrapper<Tenant> query = new QueryWrapper<>();
         query.like("tenant_name", tenantName);
-        List<TenantDTO> list = tenantDeptService.tenantList(query,deptId);
+        List<TenantDTO> list = tenantDeptService.tenantList(query, deptId);
         return ResponseData.success(list);
     }
 
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
index fe10182..2d90bc0 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
@@ -90,9 +90,19 @@
             <include refid="keywords_sql"/>
             )
         </if>
-        ORDER BY "deviceCount" DESC
+        <include refid="count_sort_sql"/>
     </select>
 
+    <sql id="count_sort_sql" databaseId="oracle">
+        ORDER BY deviceCount DESC
+    </sql>
+    <sql id="count_sort_sql" databaseId="mysql">
+        ORDER BY deviceCount DESC
+    </sql>
+    <sql id="count_sort_sql" databaseId="pgsql">
+        ORDER BY "deviceCount" DESC
+    </sql>
+
     <sql id="keywords_sql" databaseId="oracle">
         '%'||#{keywords}||'%'
     </sql>