From 8edc8701512d6a02492c8f8d38c05a4253650117 Mon Sep 17 00:00:00 2001
From: yangyang
Date: 星期五, 21 三月 2025 08:19:22 +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 | 16 ++++++++++++----
1 files changed, 12 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 8d7f157..2521ad4 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
@@ -22,6 +22,7 @@
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
@@ -76,8 +77,7 @@
if (Objects.isNull(loc.getTypeIds())) {
throw new CoolException("搴撲綅绫诲瀷涓嶈兘涓虹┖锛侊紒");
}
- List<Long> lists = JSONArray.parseArray(loc.getTypeIds(), Long.class);
- String join = StringUtils.join(lists, ",");
+ String join = StringUtils.join(loc.getTypeIds(), ",");
loc.setType(join);
loc.setCreateBy(getLoginUserId());
@@ -87,7 +87,7 @@
}
if (!locService.saveType(loc)) {
- throw new CoolException("搴撲綅绫诲瀷淇濆瓨澶辫触锛侊紒");
+ throw new CoolException("搴撲綅绫诲瀷鍏宠仈鍏崇郴淇濆瓨澶辫触锛侊紒");
}
return R.ok("Save Success").add(loc);
}
@@ -95,12 +95,20 @@
@PreAuthorize("hasAuthority('manager:loc:update')")
@OperationLog("Update 搴撲綅淇℃伅琛�")
@PostMapping("/loc/update")
+ @Transactional(rollbackFor = Exception.class)
public R update(@RequestBody Loc loc) {
loc.setUpdateBy(getLoginUserId());
- loc.setUpdateTime(new Date());
+
+ String join = StringUtils.join(loc.getTypeIds(), ",");
+ loc.setType(join);
+
if (!locService.updateById(loc)) {
return R.error("Update Fail");
}
+
+ if (!locService.updateLoc(loc)) {
+ throw new CoolException("搴撲綅绫诲瀷鍏宠仈鍏崇郴淇敼澶辫触!@锛�");
+ }
return R.ok("Update Success").add(loc);
}
--
Gitblit v1.9.1