From 06997ad92d77b7dd8a002df16b5b0cadc528d5f5 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 24 八月 2023 15:28:52 +0800
Subject: [PATCH] 111
---
server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 1c900a7..e22b797 100644
--- a/server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java
@@ -111,7 +111,7 @@
@Override
public Device findOne(Device device) {
QueryWrapper<Device> wrapper = new QueryWrapper<>(device);
- return deviceMapper.selectOne(wrapper);
+ return deviceMapper.selectOne(wrapper.last("limit 1"));
}
@Override
@@ -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);
@@ -253,7 +253,7 @@
userDeviceMapper.delete(new QueryWrapper<UserDevice>().eq("DEVICE_ID",deviceId));
}
if(StringUtils.isNotEmpty(userIds)){
- String [] ids=userIds.split(",");
+ String [] ids=userIds.replace(" ","").split("[.,;锛宂");
for (String id : ids) {
CompanyUser companyUser = companyUserService.findById(Integer.valueOf(id));
UserDevice userDevice = new UserDevice();
@@ -365,7 +365,7 @@
device.setFinishWarehouseLocationId(collect.get(s.getFinishWarehouseLocationName()).getId());
deviceMapper.insert(device);
if(StringUtils.isNotBlank(s.getUserIds())){
- this.dealDeviceUserId(Constants.ZERO,device.getUserIds(),device.getId(),user);
+ this.dealDeviceUserId(Constants.ZERO,device.getUserIds().trim(),device.getId(),user);
}
});
--
Gitblit v1.9.3