diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
index 9232bbf..90b611f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.expression.AccessException;
 import org.springframework.stereotype.Controller;
@@ -50,11 +51,11 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String typeName, String isValid) {
+    public Object listPage(String deviceType, String isValid) {
         Page<Map<String, Object>> page = PageFactory.defaultPage();
-        typeName = typeName == null ? "" : typeName;
-        isValid = isValid == null ? "" : isValid;
-        ResponseData responseData = deviceTypeService.listPage(page, typeName, isValid);
+        deviceType = StringUtils.isEmpty(deviceType)? "" : deviceType;
+        isValid = StringUtils.isEmpty(isValid)? "" : isValid;
+        ResponseData responseData = deviceTypeService.listPage(page, deviceType, isValid);
         responseData.setData(super.packForBT(page));
         return responseData;
     }

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
index 9232bbf..90b611f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.expression.AccessException;
 import org.springframework.stereotype.Controller;
@@ -50,11 +51,11 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String typeName, String isValid) {
+    public Object listPage(String deviceType, String isValid) {
         Page<Map<String, Object>> page = PageFactory.defaultPage();
-        typeName = typeName == null ? "" : typeName;
-        isValid = isValid == null ? "" : isValid;
-        ResponseData responseData = deviceTypeService.listPage(page, typeName, isValid);
+        deviceType = StringUtils.isEmpty(deviceType)? "" : deviceType;
+        isValid = StringUtils.isEmpty(isValid)? "" : isValid;
+        ResponseData responseData = deviceTypeService.listPage(page, deviceType, isValid);
         responseData.setData(super.packForBT(page));
         return responseData;
     }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml
index 6e6e554..9170219 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml
@@ -50,6 +50,18 @@
     GROUP  BY  pid
     </select>
 
+    <sql id="fuzzy_sql" databaseId="oracle">
+        '%' ||#{communication}||'%'
+    </sql>
+
+    <sql id="fuzzy_sql" databaseId="mysql">
+        CONCAT('%',#{communication},'%')
+    </sql>
+
+    <sql id="fuzzy_sql" databaseId="pgsql">
+        CONCAT('%',#{communication},'%')
+    </sql>
+
     <select id="getListPage" resultType="com.casic.missiles.modular.system.model.DeviceModels">
          SELECT   ID AS id,
                   MODEL_NAME AS "modelName",
@@ -61,7 +73,7 @@
             AND DEVICE_TYPE= #{deviceType}
         </if>
         <if test="communication != null and communication !=''">
-            AND COMMUNICATION = #{communication}
+            AND COMMUNICATION  like   <include refid="fuzzy_sql"/>
         </if>
     </select>
 

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
index 9232bbf..90b611f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.expression.AccessException;
 import org.springframework.stereotype.Controller;
@@ -50,11 +51,11 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String typeName, String isValid) {
+    public Object listPage(String deviceType, String isValid) {
         Page<Map<String, Object>> page = PageFactory.defaultPage();
-        typeName = typeName == null ? "" : typeName;
-        isValid = isValid == null ? "" : isValid;
-        ResponseData responseData = deviceTypeService.listPage(page, typeName, isValid);
+        deviceType = StringUtils.isEmpty(deviceType)? "" : deviceType;
+        isValid = StringUtils.isEmpty(isValid)? "" : isValid;
+        ResponseData responseData = deviceTypeService.listPage(page, deviceType, isValid);
         responseData.setData(super.packForBT(page));
         return responseData;
     }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml
index 6e6e554..9170219 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml
@@ -50,6 +50,18 @@
     GROUP  BY  pid
     </select>
 
+    <sql id="fuzzy_sql" databaseId="oracle">
+        '%' ||#{communication}||'%'
+    </sql>
+
+    <sql id="fuzzy_sql" databaseId="mysql">
+        CONCAT('%',#{communication},'%')
+    </sql>
+
+    <sql id="fuzzy_sql" databaseId="pgsql">
+        CONCAT('%',#{communication},'%')
+    </sql>
+
     <select id="getListPage" resultType="com.casic.missiles.modular.system.model.DeviceModels">
          SELECT   ID AS id,
                   MODEL_NAME AS "modelName",
@@ -61,7 +73,7 @@
             AND DEVICE_TYPE= #{deviceType}
         </if>
         <if test="communication != null and communication !=''">
-            AND COMMUNICATION = #{communication}
+            AND COMMUNICATION  like   <include refid="fuzzy_sql"/>
         </if>
     </select>
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
index 3851961..6727434 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
@@ -11,6 +11,19 @@
         <result column="WATCH_TYPE" property="watchType"/>
     </resultMap>
 
+
+    <sql id="fuzzy_sql" databaseId="oracle">
+        '%' ||#{typeName}||'%'
+    </sql>
+
+    <sql id="fuzzy_sql" databaseId="mysql">
+        CONCAT('%',#{typeName},'%')
+    </sql>
+
+    <sql id="fuzzy_sql" databaseId="pgsql">
+        CONCAT('%',#{typeName},'%')
+    </sql>
+
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         ID AS id, TYPE_NAME AS "typeName", TYPE_DESCRIPTION AS "typeDescription", VALID AS valid, WATCH_TYPE AS "watchType"
@@ -31,7 +44,7 @@
         from base_device_type
         WHERE 1=1
         <if test="typeName != null and typeName !=''">
-            AND TYPE_NAME= #{typeName}
+            AND TYPE_NAME   like   <include refid="fuzzy_sql"/>
         </if>
         <if test="isValid != null and isValid !=''">
             AND VALID = #{isValid}

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
index 9232bbf..90b611f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.expression.AccessException;
 import org.springframework.stereotype.Controller;
@@ -50,11 +51,11 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String typeName, String isValid) {
+    public Object listPage(String deviceType, String isValid) {
         Page<Map<String, Object>> page = PageFactory.defaultPage();
-        typeName = typeName == null ? "" : typeName;
-        isValid = isValid == null ? "" : isValid;
-        ResponseData responseData = deviceTypeService.listPage(page, typeName, isValid);
+        deviceType = StringUtils.isEmpty(deviceType)? "" : deviceType;
+        isValid = StringUtils.isEmpty(isValid)? "" : isValid;
+        ResponseData responseData = deviceTypeService.listPage(page, deviceType, isValid);
         responseData.setData(super.packForBT(page));
         return responseData;
     }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml
index 6e6e554..9170219 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml
@@ -50,6 +50,18 @@
     GROUP  BY  pid
     </select>
 
+    <sql id="fuzzy_sql" databaseId="oracle">
+        '%' ||#{communication}||'%'
+    </sql>
+
+    <sql id="fuzzy_sql" databaseId="mysql">
+        CONCAT('%',#{communication},'%')
+    </sql>
+
+    <sql id="fuzzy_sql" databaseId="pgsql">
+        CONCAT('%',#{communication},'%')
+    </sql>
+
     <select id="getListPage" resultType="com.casic.missiles.modular.system.model.DeviceModels">
          SELECT   ID AS id,
                   MODEL_NAME AS "modelName",
@@ -61,7 +73,7 @@
             AND DEVICE_TYPE= #{deviceType}
         </if>
         <if test="communication != null and communication !=''">
-            AND COMMUNICATION = #{communication}
+            AND COMMUNICATION  like   <include refid="fuzzy_sql"/>
         </if>
     </select>
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
index 3851961..6727434 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
@@ -11,6 +11,19 @@
         <result column="WATCH_TYPE" property="watchType"/>
     </resultMap>
 
+
+    <sql id="fuzzy_sql" databaseId="oracle">
+        '%' ||#{typeName}||'%'
+    </sql>
+
+    <sql id="fuzzy_sql" databaseId="mysql">
+        CONCAT('%',#{typeName},'%')
+    </sql>
+
+    <sql id="fuzzy_sql" databaseId="pgsql">
+        CONCAT('%',#{typeName},'%')
+    </sql>
+
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         ID AS id, TYPE_NAME AS "typeName", TYPE_DESCRIPTION AS "typeDescription", VALID AS valid, WATCH_TYPE AS "watchType"
@@ -31,7 +44,7 @@
         from base_device_type
         WHERE 1=1
         <if test="typeName != null and typeName !=''">
-            AND TYPE_NAME= #{typeName}
+            AND TYPE_NAME   like   <include refid="fuzzy_sql"/>
         </if>
         <if test="isValid != null and isValid !=''">
             AND VALID = #{isValid}
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 92b6b19..c67a350 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
@@ -43,7 +43,7 @@
     private Long deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井盖编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     private String descn;
     @ExcelProperty("采集时间")

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
index 9232bbf..90b611f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.expression.AccessException;
 import org.springframework.stereotype.Controller;
@@ -50,11 +51,11 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String typeName, String isValid) {
+    public Object listPage(String deviceType, String isValid) {
         Page<Map<String, Object>> page = PageFactory.defaultPage();
-        typeName = typeName == null ? "" : typeName;
-        isValid = isValid == null ? "" : isValid;
-        ResponseData responseData = deviceTypeService.listPage(page, typeName, isValid);
+        deviceType = StringUtils.isEmpty(deviceType)? "" : deviceType;
+        isValid = StringUtils.isEmpty(isValid)? "" : isValid;
+        ResponseData responseData = deviceTypeService.listPage(page, deviceType, isValid);
         responseData.setData(super.packForBT(page));
         return responseData;
     }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml
index 6e6e554..9170219 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml
@@ -50,6 +50,18 @@
     GROUP  BY  pid
     </select>
 
+    <sql id="fuzzy_sql" databaseId="oracle">
+        '%' ||#{communication}||'%'
+    </sql>
+
+    <sql id="fuzzy_sql" databaseId="mysql">
+        CONCAT('%',#{communication},'%')
+    </sql>
+
+    <sql id="fuzzy_sql" databaseId="pgsql">
+        CONCAT('%',#{communication},'%')
+    </sql>
+
     <select id="getListPage" resultType="com.casic.missiles.modular.system.model.DeviceModels">
          SELECT   ID AS id,
                   MODEL_NAME AS "modelName",
@@ -61,7 +73,7 @@
             AND DEVICE_TYPE= #{deviceType}
         </if>
         <if test="communication != null and communication !=''">
-            AND COMMUNICATION = #{communication}
+            AND COMMUNICATION  like   <include refid="fuzzy_sql"/>
         </if>
     </select>
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
index 3851961..6727434 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
@@ -11,6 +11,19 @@
         <result column="WATCH_TYPE" property="watchType"/>
     </resultMap>
 
+
+    <sql id="fuzzy_sql" databaseId="oracle">
+        '%' ||#{typeName}||'%'
+    </sql>
+
+    <sql id="fuzzy_sql" databaseId="mysql">
+        CONCAT('%',#{typeName},'%')
+    </sql>
+
+    <sql id="fuzzy_sql" databaseId="pgsql">
+        CONCAT('%',#{typeName},'%')
+    </sql>
+
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         ID AS id, TYPE_NAME AS "typeName", TYPE_DESCRIPTION AS "typeDescription", VALID AS valid, WATCH_TYPE AS "watchType"
@@ -31,7 +44,7 @@
         from base_device_type
         WHERE 1=1
         <if test="typeName != null and typeName !=''">
-            AND TYPE_NAME= #{typeName}
+            AND TYPE_NAME   like   <include refid="fuzzy_sql"/>
         </if>
         <if test="isValid != null and isValid !=''">
             AND VALID = #{isValid}
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 92b6b19..c67a350 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
@@ -43,7 +43,7 @@
     private Long deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井盖编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     private String descn;
     @ExcelProperty("采集时间")
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/controller/BusDeptUserController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/controller/BusDeptUserController.java
index 68eb544..c48412c 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/controller/BusDeptUserController.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/controller/BusDeptUserController.java
@@ -37,7 +37,7 @@
     @ResponseBody
     public Object responsiblePersonConfig(String deptid, String user) {
         QueryWrapper<BusDeptUser> query = new QueryWrapper<>();
-        query.eq("DEPT_ID", deptid);
+        query.eq("DEPTID", deptid);
         BusDeptUser busDeptUser = busDeptUserService.getOne(query);
         if (null == busDeptUser) {
             busDeptUser = new BusDeptUser();

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
index 9232bbf..90b611f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
@@ -9,6 +9,7 @@
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.expression.AccessException;
 import org.springframework.stereotype.Controller;
@@ -50,11 +51,11 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String typeName, String isValid) {
+    public Object listPage(String deviceType, String isValid) {
         Page<Map<String, Object>> page = PageFactory.defaultPage();
-        typeName = typeName == null ? "" : typeName;
-        isValid = isValid == null ? "" : isValid;
-        ResponseData responseData = deviceTypeService.listPage(page, typeName, isValid);
+        deviceType = StringUtils.isEmpty(deviceType)? "" : deviceType;
+        isValid = StringUtils.isEmpty(isValid)? "" : isValid;
+        ResponseData responseData = deviceTypeService.listPage(page, deviceType, isValid);
         responseData.setData(super.packForBT(page));
         return responseData;
     }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml
index 6e6e554..9170219 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceModelsMapper.xml
@@ -50,6 +50,18 @@
     GROUP  BY  pid
     </select>
 
+    <sql id="fuzzy_sql" databaseId="oracle">
+        '%' ||#{communication}||'%'
+    </sql>
+
+    <sql id="fuzzy_sql" databaseId="mysql">
+        CONCAT('%',#{communication},'%')
+    </sql>
+
+    <sql id="fuzzy_sql" databaseId="pgsql">
+        CONCAT('%',#{communication},'%')
+    </sql>
+
     <select id="getListPage" resultType="com.casic.missiles.modular.system.model.DeviceModels">
          SELECT   ID AS id,
                   MODEL_NAME AS "modelName",
@@ -61,7 +73,7 @@
             AND DEVICE_TYPE= #{deviceType}
         </if>
         <if test="communication != null and communication !=''">
-            AND COMMUNICATION = #{communication}
+            AND COMMUNICATION  like   <include refid="fuzzy_sql"/>
         </if>
     </select>
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
index 3851961..6727434 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
@@ -11,6 +11,19 @@
         <result column="WATCH_TYPE" property="watchType"/>
     </resultMap>
 
+
+    <sql id="fuzzy_sql" databaseId="oracle">
+        '%' ||#{typeName}||'%'
+    </sql>
+
+    <sql id="fuzzy_sql" databaseId="mysql">
+        CONCAT('%',#{typeName},'%')
+    </sql>
+
+    <sql id="fuzzy_sql" databaseId="pgsql">
+        CONCAT('%',#{typeName},'%')
+    </sql>
+
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         ID AS id, TYPE_NAME AS "typeName", TYPE_DESCRIPTION AS "typeDescription", VALID AS valid, WATCH_TYPE AS "watchType"
@@ -31,7 +44,7 @@
         from base_device_type
         WHERE 1=1
         <if test="typeName != null and typeName !=''">
-            AND TYPE_NAME= #{typeName}
+            AND TYPE_NAME   like   <include refid="fuzzy_sql"/>
         </if>
         <if test="isValid != null and isValid !=''">
             AND VALID = #{isValid}
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 92b6b19..c67a350 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
@@ -43,7 +43,7 @@
     private Long deptid;
     @ExcelProperty("部门名称")
     private String deptName;
-    @ExcelProperty("井盖编号")
+    @ExcelProperty("点位编号")
     private String wellCode;
     private String descn;
     @ExcelProperty("采集时间")
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/controller/BusDeptUserController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/controller/BusDeptUserController.java
index 68eb544..c48412c 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/controller/BusDeptUserController.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/controller/BusDeptUserController.java
@@ -37,7 +37,7 @@
     @ResponseBody
     public Object responsiblePersonConfig(String deptid, String user) {
         QueryWrapper<BusDeptUser> query = new QueryWrapper<>();
-        query.eq("DEPT_ID", deptid);
+        query.eq("DEPTID", deptid);
         BusDeptUser busDeptUser = busDeptUserService.getOne(query);
         if (null == busDeptUser) {
             busDeptUser = new BusDeptUser();
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/model/BusDeptUser.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/model/BusDeptUser.java
index b15f71c..bf845ac 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/model/BusDeptUser.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/model/BusDeptUser.java
@@ -32,7 +32,7 @@
     /**
      * 责任人用户ID
      */
-    @TableField("USER")
+    @TableField("USER_ID")
     private Long user;
     /**
      * 优先级(1是最高)