From 0eb8b0635a2e50ff1f82bbea890804e73aae59af Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 18 八月 2023 10:51:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java | 4 ++--
server/src/main/resources/mappers/WorkorderRecordExtMapper.xml | 1 +
2 files changed, 3 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 1c900a7..b726c65 100644
--- a/server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java
@@ -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);
}
});
diff --git a/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml b/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml
index 0e802dd..b01670d 100644
--- a/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml
+++ b/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml
@@ -444,6 +444,7 @@
left join unit d on a.UNIT_ID = d.ID
left join procedures f on a.PROCEDURE_ID =f.ID
where a.DELETED = 0
+ and a.TYPE = 1
<if test="rootDepartId != null">
AND a.`ROOT_DEPART_ID` = #{rootDepartId}
</if>
--
Gitblit v1.9.3