From ca73a173f008c8d7a9d700bad897ca24fe2d2203 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 16 十月 2023 09:29:57 +0800
Subject: [PATCH] 111
---
server/src/main/java/doumeemes/api/ext/DeviceExtController.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/server/src/main/java/doumeemes/api/ext/DeviceExtController.java b/server/src/main/java/doumeemes/api/ext/DeviceExtController.java
index 39931c4..39d5686 100644
--- a/server/src/main/java/doumeemes/api/ext/DeviceExtController.java
+++ b/server/src/main/java/doumeemes/api/ext/DeviceExtController.java
@@ -128,11 +128,11 @@
}
- QueryDeviceExtDTO queryDeviceExtDTO=new QueryDeviceExtDTO();
+ Device queryDeviceExtDTO=new Device();
queryDeviceExtDTO.setDeleted(Constants.ZERO);
queryDeviceExtDTO.setCode(device.getCode());
queryDeviceExtDTO.setRootDepartId(getLoginUser().getRootDepartment().getId());
- List<DeviceExtListVO> list= deviceExtService.getListByCondition(queryDeviceExtDTO);
+ List<Device> list= deviceService.findList(queryDeviceExtDTO);
if(list.size()>0){
if(!Constants.equalsInteger(list.get(0).getId(),device.getId())){
return ApiResponse.failed("璁惧缂栫爜锛屼笉鍏佽娣诲姞");
@@ -166,6 +166,10 @@
deviceService.updateById(find);
if(StringUtils.isNotBlank(device.getUserIds())){
deviceService.dealDeviceUserId(Constants.ONE,device.getUserIds(),device.getId(),getLoginUser());
+ }else {
+ UserDevice userDevice = new UserDevice();
+ userDevice.setDeviceId(device.getId());
+ userDeviceService.delete(userDevice);
}
return ApiResponse.success(null);
--
Gitblit v1.9.3