@@ -74,6 +74,8 @@ public class DeviceInfoServiceImpl implements DeviceInfoService {
@Override
public List<DeviceInfo> findByCompanyId(String companyId){
+ //去掉了删除判断
+ //需要查出已删除的设备
return deviceInfoDAO.findByCompanyId(companyId);
}
@@ -218,7 +218,6 @@ id_, header_,device_no,alias_name,address_,is_online,company_id,unlock_password,
where b.device_id=a.id_ and b.company_id=#{0}
)
- and del_flag=0
order by create_time asc
]]>
</select>