From 1014402be25cd1f48d6efab06e51a77f073578d4 Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期二, 25 三月 2025 15:09:51 +0800
Subject: [PATCH] 11
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 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 90d9286..e65f062 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
@@ -73,13 +73,11 @@
if (Objects.isNull(matnrGroup.getCode())) {
throw new CoolException("鍒嗙粍缂栫爜涓嶈兘涓虹┖锛侊紒");
}
- if (Objects.isNull(matnrGroup.getParCode())) {
- throw new CoolException("涓婄骇缂栫爜涓嶈兘涓虹┖锛�!");
- }
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("鐗╂枡鍒嗙粍缂栫爜涓嶈兘閲嶅锛侊紒");
@@ -103,6 +101,7 @@
@OperationLog("Update 鐗╂枡鍒嗙被琛�")
@PostMapping("/matnrGroup/update")
public R update(@RequestBody MatnrGroup matnrGroup) {
+
matnrGroup.setUpdateBy(getLoginUserId());
MatnrGroup matGroup = matnrGroupService.getById(matnrGroup.getId());
if (!matnrGroup.getName().equals(matGroup.getName())) {
@@ -111,14 +110,16 @@
throw new CoolException("浠撳簱鍚嶅凡瀛樺湪锛侊紒");
}
}
- 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("浠撳簱缂栫爜宸插瓨鍦紒锛�");
}
}
- //鍒ゆ柇涓婄骇缂栫爜鏄惁涓虹┖
+ //鍒ゆ柇涓婄骇缂栫爜鏄惁涓虹┖
if (!Objects.isNull(matnrGroup.getParCode()) && !StringUtils.isBlank(matnrGroup.getParCode())) {
matnrGroup.setCode(matnrGroup.getParCode() + matnrGroup.getCode());
}
--
Gitblit v1.9.1