From 79e481b7da2a83c769f9709eeec0e7130359be1b Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期五, 05 七月 2024 16:59:12 +0800
Subject: [PATCH] 添加取水口和更改取水口时判断取水口是否重名 重新优化
---
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java
index 9bbdea9..2d966ea 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java
@@ -147,12 +147,9 @@
if (bindingResult != null && bindingResult.hasErrors()) {
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
- List<String> intakeNameList = intakeSv.getIntakeName();
- for (int i = 0; i < intakeNameList.size(); i++) {
- String intakeName = intakeNameList.get(i);
- if (intakeName.equals(po.getName())) {
- return BaseResponseUtils.buildFail(ProjectResultCode.INTAKE_NAME_EXIST.getMessage());
- }
+ List<Long> ids = intakeSv.getIntakeIdByName1(po.getName());
+ if (ids.size() > 0) {
+ return BaseResponseUtils.buildFail(ProjectResultCode.INTAKE_NAME_EXIST.getMessage());
}
Date operateTime = new Date();
po.setOperateDt(operateTime);
@@ -185,10 +182,12 @@
if (bindingResult != null && bindingResult.hasErrors()) {
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
- List<String> intakeNameList = intakeSv.getIntakeName();
- for (int i = 0; i < intakeNameList.size(); i++) {
- String intakeName = intakeNameList.get(i);
- if (intakeName.equals(po.getName())) {
+ List<Long> ids = intakeSv.getIntakeIdByName1(po.getName());
+ if (ids.size() > 0){
+ if (!ids.contains(po.getId())){
+ return BaseResponseUtils.buildFail(ProjectResultCode.INTAKE_NAME_EXIST.getMessage());
+ }
+ if (ids.size() > 1){
return BaseResponseUtils.buildFail(ProjectResultCode.INTAKE_NAME_EXIST.getMessage());
}
}
--
Gitblit v1.8.0