From 9fe1ec3afe8696c628d076d1f76686c4efc3012e Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期二, 21 十月 2025 10:49:55 +0800
Subject: [PATCH] 容器初始化功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java
index ac10eb2..ff0cb65 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java
@@ -65,26 +65,28 @@
@PostMapping("/matnrGroup/save")
public R save(@RequestBody MatnrGroup matnrGroup) {
if (Objects.isNull(matnrGroup)) {
- throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
+
if (Objects.isNull(matnrGroup.getName())) {
- throw new CoolException("鍒嗙粍鍚嶇О涓嶈兘涓虹┖锛侊紒");
+ return R.error("鍒嗙粍鍚嶇О涓嶈兘涓虹┖锛侊紒");
}
if (Objects.isNull(matnrGroup.getCode())) {
- throw new CoolException("鍒嗙粍缂栫爜涓嶈兘涓虹┖锛侊紒");
+ return R.error("鍒嗙粍缂栫爜涓嶈兘涓虹┖锛侊紒");
}
matnrGroup.setCreateBy(getLoginUserId());
matnrGroup.setUpdateBy(getLoginUserId());
List<MatnrGroup> list = matnrGroupService.list(new LambdaQueryWrapper<MatnrGroup>()
+ .eq(!Objects.isNull(matnrGroup.getParCode()), MatnrGroup::getParCode, matnrGroup.getParCode())
.eq(MatnrGroup::getCode, matnrGroup.getCode()));
if (!list.isEmpty()) {
- throw new CoolException("鐗╂枡鍒嗙粍缂栫爜涓嶈兘閲嶅锛侊紒");
+ return R.error("鐗╂枡鍒嗙粍缂栫爜涓嶈兘閲嶅锛侊紒");
}
List<MatnrGroup> groups = matnrGroupService.list(new LambdaQueryWrapper<MatnrGroup>()
.eq(MatnrGroup::getName, matnrGroup.getName()));
if (!groups.isEmpty()) {
- throw new CoolException("鍒嗙粍宸插瓨鍦紝璇峰嬁閲嶅娣诲姞锛侊紒");
+ return R.error("鍒嗙粍宸插瓨鍦紝璇峰嬁閲嶅娣诲姞锛侊紒");
}
//鍒ゆ柇涓婄骇缂栫爜鏄惁涓虹┖
if (!Objects.isNull(matnrGroup.getParCode()) && !StringUtils.isBlank(matnrGroup.getParCode())) {
@@ -100,24 +102,25 @@
@OperationLog("Update 鐗╂枡鍒嗙被琛�")
@PostMapping("/matnrGroup/update")
public R update(@RequestBody MatnrGroup matnrGroup) {
+
matnrGroup.setUpdateBy(getLoginUserId());
MatnrGroup matGroup = matnrGroupService.getById(matnrGroup.getId());
+ if (Objects.isNull(matGroup)) {
+ return R.error("鐗╂枡鍒嗙粍涓嶅瓨鍦紒锛�");
+ }
if (!matnrGroup.getName().equals(matGroup.getName())) {
List<MatnrGroup> areasList = matnrGroupService.list(new LambdaQueryWrapper<MatnrGroup>().eq(MatnrGroup::getName, matnrGroup.getName()));
if (!areasList.isEmpty()) {
- throw new CoolException("浠撳簱鍚嶅凡瀛樺湪锛侊紒");
+ return R.error("浠撳簱鍚嶅凡瀛樺湪锛侊紒");
}
}
- if (!matnrGroup.getCode().equals(matGroup.getCode())) {
- List<MatnrGroup> areasList = matnrGroupService.list(new LambdaQueryWrapper<MatnrGroup>().eq(MatnrGroup::getCode, matnrGroup.getCode()));
+ if (!Objects.isNull(matnrGroup.getCode()) && !matnrGroup.getCode().equals(matGroup.getCode())) {
+ List<MatnrGroup> areasList = matnrGroupService.list(new LambdaQueryWrapper<MatnrGroup>()
+ .eq(!Objects.isNull(matnrGroup.getParCode()), MatnrGroup::getParCode, matnrGroup.getParCode())
+ .eq(MatnrGroup::getCode, matnrGroup.getCode()));
if (!areasList.isEmpty()) {
- throw new CoolException("浠撳簱缂栫爜宸插瓨鍦紒锛�");
+ return R.error("浠撳簱缂栫爜宸插瓨鍦紒锛�");
}
- }
-
- //鍒ゆ柇涓婄骇缂栫爜鏄惁涓虹┖
- if (!Objects.isNull(matnrGroup.getParCode()) && !StringUtils.isBlank(matnrGroup.getParCode())) {
- matnrGroup.setCode(matnrGroup.getParCode() + matnrGroup.getCode());
}
if (!matnrGroupService.updateById(matnrGroup)) {
--
Gitblit v1.9.1