From 96c5a333ec502b7d545648e8996b8b9c3e39ec2c Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 26 三月 2025 15:12:58 +0800
Subject: [PATCH] 删除下载安全策略
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java
index 15f42fa..bc36c4b 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java
@@ -49,9 +49,9 @@
throw new CoolException("淇敼搴撲綅淇℃伅涓嶈兘涓虹┖锛侊紒");
}
- String join = locs.getLoc().getType();
- if (!Objects.isNull(locs.getTypeIds()) && !locs.getTypeIds().isEmpty()) {
- join = StringUtils.join(locs.getTypeIds(), ",");
+ String join = loc.getType();
+ if (!Objects.isNull(loc.getTypeIds()) && !loc.getTypeIds().isEmpty()) {
+ join = StringUtils.join(loc.getTypeIds(), ",");
}
boolean update = this.update(new LambdaUpdateWrapper<Loc>()
.in(Loc::getId, locs.getId())
@@ -59,7 +59,7 @@
.set(!Objects.isNull(loc.getAreaId()), Loc::getAreaId, loc.getAreaId())
.set(!Objects.isNull(loc.getWarehouseId()), Loc::getWarehouseId, loc.getWarehouseId())
.set(!Objects.isNull(loc.getUseStatus()), Loc::getUseStatus, loc.getUseStatus())
- .set(!Objects.isNull(loc.getType()), Loc::getType, join)
+ .set(!Objects.isNull(loc.getTypeIds()) && !loc.getTypeIds().isEmpty(), Loc::getType, join)
.set(!Objects.isNull(loc.getLength()), Loc::getLength, loc.getLength())
.set(!Objects.isNull(loc.getWidth()), Loc::getWidth, loc.getWidth())
.set(!Objects.isNull(loc.getHeight()), Loc::getHeight, loc.getHeight())
@@ -108,9 +108,21 @@
}
}
}
+
if (!this.saveBatch(list)) {
throw new CoolException("搴撲綅鍒濆鍖栧け璐ワ紒锛�");
}
+ List<LocTypeRela> locTypeRelas = new ArrayList<>();
+ for (Long typeId : param.getTypeIds()) {
+ for (Loc loc : list) {
+ LocTypeRela typeRela = new LocTypeRela();
+ typeRela.setLocId(loc.getId()).setTypeId(typeId);
+ locTypeRelas.add(typeRela);
+ }
+ }
+ if (!locTypeRelaService.saveBatch(locTypeRelas)) {
+ throw new CoolException("搴撲綅绫诲瀷鍏宠仈澶辫触锛侊紒");
+ }
return R.ok("鍒濆鍖栨垚鍔燂紒锛�");
}
--
Gitblit v1.9.1