diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceTypeController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceTypeController.java
index bf7e8a7d..3df42a65 100644
--- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceTypeController.java
+++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceTypeController.java
@@ -15,6 +15,7 @@ import com.nflg.mobilebroken.common.pojo.ApiResult;
 import com.nflg.mobilebroken.common.pojo.PageData;
 import com.nflg.mobilebroken.common.pojo.vo.CqmPersonVO;
 import com.nflg.mobilebroken.common.util.AdminUserUtil;
+import com.nflg.mobilebroken.common.util.VUtils;
 import com.nflg.mobilebroken.repository.entity.ParamConfig;
 import com.nflg.mobilebroken.repository.entity.TBaseDeviceType;
 import com.nflg.mobilebroken.repository.service.IParamConfigService;
@@ -105,4 +106,15 @@ public class DeviceTypeController extends ControllerBase {
         return ApiResult.success(baseDeviceTypeService.getCqmPersonList(cqms));
     }
 
+    /**
+     * 删除
+     * @return
+     */
+    @PostMapping("del")
+    @ApiMark(moduleName = "设备类型管理", apiName = "删除")
+    public ApiResult<Boolean> del(@RequestBody List<Long> ids){
+        VUtils.trueThrow(CollUtil.isEmpty(ids)).throwMessage(STATE.ParamErr,"请选择要删除的数据");
+        return ApiResult.success(baseDeviceTypeService.removeBatchByIds(ids));
+    }
+
 }
diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceMapper.xml
index 8c424649..d211b7d1 100644
--- a/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceMapper.xml
+++ b/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceMapper.xml
@@ -12,27 +12,29 @@
     </select>
     <sql id="whr">
         <if test="query.deviceNo!=null and query.deviceNo!=''">
-            and  device_no=#{query.deviceNo}
+            and  a.device_no=#{query.deviceNo}
         </if>
         <if test="query.customerName!=null and query.customerName!=''">
-            and customer_name=#{query.customerName}
+            and a.customer_name=#{query.customerName}
         </if>
         <if test="query.agentName!=null and query.agentName!=''">
-            and agent_name=#{query.agentName}
+            and a.agent_name=#{query.agentName}
         </if>
         <if test="query.modelNo!=null and query.modelNo!=''">
-            and model_no=#{query.modelNo}
+            and a.model_no=#{query.modelNo}
         </if>
         <if test="query.warrantyState!=null and query.warrantyState!=''">
-            and warranty_state=#{query.warrantyState}
+            and a.warranty_state=#{query.warrantyState}
         </if>
         <if test="query.warrantyStartDate!=null and query.warrantyStartDate!=''">
-            and start_warranty_date &gt;= #{query.warrantyStartDate} and start_warranty_date &lt;= #{query.warrantyEndDate}
+            and a.start_warranty_date &gt;= #{query.warrantyStartDate} and start_warranty_date &lt;= #{query.warrantyEndDate}
         </if>
     </sql>
 
     <select id="getList" resultType="com.nflg.mobilebroken.repository.entity.Device">
-        select * from  device where data_valid_state=1
+        select a.id, device_no, device_name, device_type, device_type_sub, model_no, customer_id, customer_name, device_state, agent_code, agent_name,   shipment_date, warranty_state, start_warranty_date, warranty_month, data_valid_state, source_from, create_by, create_time, update_by, update_time, remark ,b.area_code ,b.area_name from  device a
+        left   join t_base_customer b on a.agent_code=b.agency_company_code
+        where data_valid_state=1
         <include refid="whr"/>
 
     </select>