diff --git a/psdc-business/src/main/java/com/psdc/mapper/PsdcDeviceMapper.java b/psdc-business/src/main/java/com/psdc/mapper/PsdcDeviceMapper.java
index 9a65c86..cb8538b 100644
--- a/psdc-business/src/main/java/com/psdc/mapper/PsdcDeviceMapper.java
+++ b/psdc-business/src/main/java/com/psdc/mapper/PsdcDeviceMapper.java
@@ -73,7 +73,8 @@ public interface PsdcDeviceMapper{
       * @param userId
       * @return
       */
-     List<PsdcDevice> queryByUserId(Long userId);
+     List<PsdcDevice> queryByUserId(@Param(value = "userId") Long userId,
+                                    @Param(value = "parentId") Integer parentId);
 
      /**
       * 根据设备id修改设备状态
diff --git a/psdc-business/src/main/java/com/psdc/service/impl/PsdcDeviceServiceImpl.java b/psdc-business/src/main/java/com/psdc/service/impl/PsdcDeviceServiceImpl.java
index b058925..444232c 100644
--- a/psdc-business/src/main/java/com/psdc/service/impl/PsdcDeviceServiceImpl.java
+++ b/psdc-business/src/main/java/com/psdc/service/impl/PsdcDeviceServiceImpl.java
@@ -52,11 +52,11 @@ public class PsdcDeviceServiceImpl implements IPsdcDeviceService {
      * @return 设备列表
      */
     public List<PsdcDevice> queryByUserId() {
-        return psdcDeviceMapper.queryByUserId(SecurityUtils.getUserId());
+        return psdcDeviceMapper.queryByUserId(SecurityUtils.getUserId(), 0);
     }
 
     public List<DeviceStatusVo> queryDeviceStatus() {
-        List<PsdcDevice> psdcDevices = psdcDeviceMapper.controlQueryByUserId(SecurityUtils.getUserId());
+        List<PsdcDevice> psdcDevices = psdcDeviceMapper.queryByUserId(SecurityUtils.getUserId(), 0);
         return psdcDevices.stream().map(psdcDevice -> {
             DeviceStatusVo deviceStatusVo = new DeviceStatusVo();
             BeanUtils.copyProperties(psdcDevice, deviceStatusVo);
diff --git a/psdc-business/src/main/resources/mapper/business/PsdcDeviceMapper.xml b/psdc-business/src/main/resources/mapper/business/PsdcDeviceMapper.xml
index e10573c..e933a73 100644
--- a/psdc-business/src/main/resources/mapper/business/PsdcDeviceMapper.xml
+++ b/psdc-business/src/main/resources/mapper/business/PsdcDeviceMapper.xml
@@ -73,24 +73,15 @@
     </select>
 
     <select id="queryByUserId" resultMap="PsdcDeviceMap">
-        select device_id, parent_id, device_model, is_control,
-               user_id,
-               device_type,
-               device_sn,
-               device_name,
-               hard_version,
-               soft_version,
-               device_address,
-               start_time,
-               device_status,
-               device_runstatus,
-               photo_url,
-               create_by,
-               create_time,
-               update_by,
-               update_time
-        from psdc_device
-        where user_id = #{userId}
+        Select * From psdc_device
+        <where>
+            <if test="userId != null and userId != ''">
+                And user_id = #{userId}
+            </if>
+            <if test="parentId != null and parentId != ''">
+                And parent_id = #{parentId}
+            </if>
+        </where>
     </select>
 
     <!--分页查询指定行数据-->
@@ -211,7 +202,7 @@
         insert into psdc_device(user_id, device_type,   parent_id, device_model, is_control, device_sn, device_name, hard_version, soft_version,
                                 device_address, start_time, device_status, device_runstatus, photo_url, create_by,
                                 create_time, update_by, update_time)
-        values (#{userId}, #{deviceType}, #{deviceModel},#{parentId},#{isControl, #{deviceSn}, #{deviceName}, #{hardVersion}, #{softVersion}, #{deviceAddress},
+        values (#{userId}, #{deviceType}, #{deviceModel},#{parentId},#{isControl}, #{deviceSn}, #{deviceName}, #{hardVersion}, #{softVersion}, #{deviceAddress},
                 #{startTime}, #{deviceStatus}, #{deviceRunstatus}, #{photoUrl}, #{createBy}, #{createTime}, #{updateBy},
                 #{updateTime})
     </insert>
@@ -222,7 +213,7 @@
         create_time, update_by, update_time)
         Values
         <foreach collection="devRecord" item="entity" separator=",">
-            (NULL, #{entity.deviceType}, #{entity.deviceSn}, #{entity.deviceName}, #{entity.hardVersion}, #{entity.softVersion}, #{entity.deviceAddress},
+            (NULL, #{entity.deviceType}, #{entity.deviceSn}, #{entity.deviceModel},#{entity.parentId},#{entity.isControl}, #{entity.deviceName}, #{entity.hardVersion}, #{entity.softVersion}, #{entity.deviceAddress},
             #{entity.startTime}, #{entity.deviceStatus}, #{entity.deviceRunstatus}, #{entity.photoUrl}, #{entity.createBy}, #{entity.createTime}, NULL, NULL)
         </foreach>
     </insert>