diff --git a/aucma-base/src/main/java/com/aucma/base/service/impl/BaseDeviceLedgerServiceImpl.java b/aucma-base/src/main/java/com/aucma/base/service/impl/BaseDeviceLedgerServiceImpl.java
index 9fd21ce..5ca7e53 100644
--- a/aucma-base/src/main/java/com/aucma/base/service/impl/BaseDeviceLedgerServiceImpl.java
+++ b/aucma-base/src/main/java/com/aucma/base/service/impl/BaseDeviceLedgerServiceImpl.java
@@ -92,20 +92,34 @@ public class BaseDeviceLedgerServiceImpl implements IBaseDeviceLedgerService
     }
 
     /**
-     * 获取设备编号
+     * 获取设备编号（生成建议编号，用户可修改）
+     * 兼容不同类型的编号格式：E00001、SJ_2 等
      * @return
      */
     @Override
     public String getDeviceCode() {
         String deviceCode = baseDeviceLedgerMapper.getDeviceCode();
-        String numericPart = deviceCode.substring(1);
-        // 将数字部分转换为整数并加1
-        int incrementedNumber = Integer.parseInt(numericPart) + 1;
-        // 格式化加1后的数字部分，确保总长度为5位
-        String formattedNumber = String.format("%05d", incrementedNumber);
-        // 拼接 'E' 和格式化后的数字部分
-        String newDeviceCode = "E" + formattedNumber;
-        return newDeviceCode;
+        // 如果没有设备记录，返回默认编号
+        if (deviceCode == null || deviceCode.isEmpty()) {
+            return "E00001";
+        }
+        // 尝试提取数字部分
+        String numericPart = deviceCode.replaceAll("[^0-9]", "");
+        if (numericPart.isEmpty()) {
+            // 没有数字部分，返回默认编号
+            return "E00001";
+        }
+        try {
+            // 将数字部分转换为整数并加1
+            int incrementedNumber = Integer.parseInt(numericPart) + 1;
+            // 格式化加1后的数字部分，确保总长度为5位
+            String formattedNumber = String.format("%05d", incrementedNumber);
+            // 拼接 'E' 和格式化后的数字部分
+            return "E" + formattedNumber;
+        } catch (NumberFormatException e) {
+            // 解析失败，返回默认编号
+            return "E00001";
+        }
     }
 
 }
diff --git a/aucma-base/src/main/resources/mapper/base/BaseDeviceParamMapper.xml b/aucma-base/src/main/resources/mapper/base/BaseDeviceParamMapper.xml
index 6760b4e..6faa578 100644
--- a/aucma-base/src/main/resources/mapper/base/BaseDeviceParamMapper.xml
+++ b/aucma-base/src/main/resources/mapper/base/BaseDeviceParamMapper.xml
@@ -46,20 +46,18 @@
     <select id="selectBaseDeviceParamList" parameterType="BaseDeviceParam" resultMap="BaseDeviceParamResult">
         <include refid="selectBaseDeviceParamVo"/>
         <where>
-            <if test="paramCode != null  and paramCode != ''">and param_code = #{paramCode}</if>
-            <if test="paramName != null  and paramName != ''">and param_name like concat(concat('%', #{paramName}),
-                '%')
-            </if>
-            <if test="paramNetwork != null  and paramNetwork != ''">and param_network = #{paramNetwork}</if>
-            <if test="paramAddress != null  and paramAddress != ''">and param_address = #{paramAddress}</if>
-            <if test="paramType != null  and paramType != ''">and param_type = #{paramType}</if>
-            <if test="deviceCode != null  and deviceCode != ''">and device_code = #{deviceCode}</if>
-            <if test="readFrequency != null ">and read_frequency = #{readFrequency}</if>
-            <if test="isFlag != null ">and is_flag = #{isFlag}</if>
-            <if test="createdBy != null  and createdBy != ''">and created_by = #{createdBy}</if>
-            <if test="createdTime != null ">and created_time = #{createdTime}</if>
-            <if test="updatedBy != null  and updatedBy != ''">and updated_by = #{updatedBy}</if>
-            <if test="updatedTime != null ">and updated_time = #{updatedTime}</if>
+            <if test="paramCode != null  and paramCode != ''">and dp.param_code = #{paramCode}</if>
+            <if test="paramName != null  and paramName != ''">and dp.param_name like concat(concat('%', #{paramName}), '%')</if>
+            <if test="paramNetwork != null  and paramNetwork != ''">and dp.param_network = #{paramNetwork}</if>
+            <if test="paramAddress != null  and paramAddress != ''">and dp.param_address = #{paramAddress}</if>
+            <if test="paramType != null  and paramType != ''">and dp.param_type = #{paramType}</if>
+            <if test="deviceCode != null  and deviceCode != ''">and dp.device_code = #{deviceCode}</if>
+            <if test="readFrequency != null ">and dp.read_frequency = #{readFrequency}</if>
+            <if test="isFlag != null ">and dp.is_flag = #{isFlag}</if>
+            <if test="createdBy != null  and createdBy != ''">and dp.created_by = #{createdBy}</if>
+            <if test="createdTime != null ">and dp.created_time = #{createdTime}</if>
+            <if test="updatedBy != null  and updatedBy != ''">and dp.updated_by = #{updatedBy}</if>
+            <if test="updatedTime != null ">and dp.updated_time = #{updatedTime}</if>
         </where>
     </select>