Merge branch 'usky-zyj' of uskycloud/usky-modules into server-165

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/DmpDeviceInfoServiceImpl.java

@@ -98,7 +98,8 @@ public class DmpDeviceInfoServiceImpl extends AbstractCrudService<DmpDeviceInfoM
         queryWrapper
                 .eq(DmpDeviceInfo::getDeviceId,dmpDeviceInfo.getDeviceId())
                 .eq(DmpDeviceInfo::getProductCode,dmpDeviceInfo.getProductCode())
-                .eq(DmpDeviceInfo::getDeleteFlag,0);
+                .eq(DmpDeviceInfo::getDeleteFlag,0)
+                .eq(DmpDeviceInfo::getTenantId,SecurityUtils.getTenantId());
         DmpDeviceInfo one = this.getOne(queryWrapper);
         return null != one && !Objects.equals(one.getId(), id);
     }

service-iot/service-iot-biz/src/main/resources/mapper/iot/DmpDeviceInfoMapper.xml

@@ -24,13 +24,13 @@
         select ddi.*,dds.device_status as deviceStatus
         from dmp_device ddi
         left join dmp_device_status dds
-        on ddi.device_id  = dds.device_id
+        on ddi.device_id  = dds.device_id and ddi.product_id = dds.product_id
         <where>
             <if test="ar.deviceName != null">
                 and ddi.device_name like CONCAT('%',#{ar.deviceName},'%')
             </if>
             <if test="ar.productId != null">
-                and ddi.product_id = #{ar.productId} and dds.product_id = #{ar.productId}
+                and ddi.product_id = #{ar.productId}
             </if>
             <if test="ar.serviceStatus != null">
                 and ddi.service_status = #{ar.serviceStatus}