From 1aa94fb921d57707aa83009a75708aed4beaee95 Mon Sep 17 00:00:00 2001
From: Mr.Shi <1878285526@qq.com>
Date: 星期五, 01 九月 2023 11:51:57 +0800
Subject: [PATCH] 小程序
---
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