From 515dc2664c481e3a65245b71aa1ff4a4d6bfb64f Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 21 三月 2025 15:32:06 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java
index 5c18951..5911c69 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java
@@ -98,10 +98,11 @@
@Transactional(rollbackFor = Exception.class)
public R update(@RequestBody Loc loc) {
loc.setUpdateBy(getLoginUserId());
-
String join = StringUtils.join(loc.getTypeIds(), ",");
loc.setType(join);
-
+ if (Objects.isNull(loc.getTypeIds())) {
+ throw new CoolException("搴撲綅绫诲瀷涓嶈兘涓虹┖锛侊紒");
+ }
if (!locService.updateById(loc)) {
return R.error("Update Fail");
}
@@ -166,8 +167,8 @@
if (Objects.isNull(locs)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- locs.setCreateBy(getLoginUser().getId());
- locs.setUpdateBy(getLoginUser().getId());
+ locs.setCreateBy(getLoginUserId());
+ locs.setUpdateBy(getLoginUserId());
return locService.batchBindLocs(locs);
}
--
Gitblit v1.9.1