From 76d4ed516122db433859648d58bc971c7b0ce581 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 05 七月 2024 17:23:55 +0800
Subject: [PATCH] 修改取水口名称（编号）重复验证
---
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java | 17 +++++------------
1 files changed, 5 insertions(+), 12 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 2d966ea..455015f 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,11 @@
if (bindingResult != null && bindingResult.hasErrors()) {
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
- List<Long> ids = intakeSv.getIntakeIdByName1(po.getName());
+ List<Long> ids = intakeSv.getIntakeIdsByName(po.getName());
if (ids.size() > 0) {
return BaseResponseUtils.buildFail(ProjectResultCode.INTAKE_NAME_EXIST.getMessage());
}
- Date operateTime = new Date();
- po.setOperateDt(operateTime);
+ po.setOperateDt(new Date());
po.setDeleted((byte)0);
Integer rec = Optional.ofNullable(intakeSv.addIntake(po)).orElse(0);
if (rec == 0) {
@@ -182,18 +181,12 @@
if (bindingResult != null && bindingResult.hasErrors()) {
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
- List<Long> ids = intakeSv.getIntakeIdByName1(po.getName());
+ List<Long> ids = intakeSv.getIntakeIdByNameExcludeId(po.getId(), 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());
- }
+ return BaseResponseUtils.buildFail(ProjectResultCode.INTAKE_NAME_EXIST.getMessage());
}
int count;
- Date operateTime = new Date();
- po.setOperateDt(operateTime);
+ po.setOperateDt( new Date());
try {
count = this.intakeSv.update(po);
} catch (Exception e) {
--
Gitblit v1.8.0