From 6815206f357f19ba27593e5bfae01f5eccf9b2d8 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期四, 24 八月 2023 18:43:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java b/server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java
index ac31276..e22b797 100644
--- a/server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java
@@ -219,11 +219,11 @@
}
}
- QueryDeviceExtDTO queryDeviceExtDTO=new QueryDeviceExtDTO();
+ Device queryDeviceExtDTO=new Device();
queryDeviceExtDTO.setDeleted(Constants.ZERO);
queryDeviceExtDTO.setCode(device.getCode());
queryDeviceExtDTO.setRootDepartId(user.getRootDepartment().getId());
- List<DeviceExtListVO> list= deviceExtService.getListByCondition(queryDeviceExtDTO);
+ List<Device> list= this.findList(queryDeviceExtDTO);
/* QueryDeviceExtDTO queryDeviceExtDTO1=new QueryDeviceExtDTO();
queryDeviceExtDTO1.setDeleted(Constants.ZERO);
--
Gitblit v1.9.3