From f66dc30060a34526e0603f698aba0e2dfc30f206 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 05 七月 2024 16:16:32 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 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 6d73906..9bbdea9 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,7 +147,13 @@
         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());
+            }
+        }
         Date operateTime = new Date();
         po.setOperateDt(operateTime);
         po.setDeleted((byte)0);
@@ -179,13 +185,20 @@
         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());
+            }
+        }
         int count;
         Date operateTime = new Date();
         po.setOperateDt(operateTime);
         try {
             count = this.intakeSv.update(po);
         } catch (Exception e) {
-            log.error("淇濆瓨鍒嗘按鍙e紓甯�", e);
+            log.error("淇濆瓨鍙栨按鍙e紓甯�", e);
             return BaseResponseUtils.buildException(e.getMessage());
         }
         if (count <= 0) {

--
Gitblit v1.8.0