From b9e0f06eb30c3b77171cd78b9311758d17400d5b Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期六, 06 七月 2024 10:39:31 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
index 1ce5038..2d7461b 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
@@ -443,8 +443,16 @@
     SELECT id AS intakeId FROM pr_intake WHERE `name` = #{intakeName}
   </select>
 
-  <!--寰楀埌鎵�鏈夌殑鍙栨按鍙e悕绉�-->
-  <select id="getIntakeName" resultType="java.lang.String">
-    SELECT `name`  FROM pr_intake WHERE deleted = 0
+  <!--鍙栨按鍙e悕绉版崲鍙栨按鍙D锛岄獙璇佹槸鍚﹂噸澶嶅悕绉颁娇鐢�-->
+  <select id="getIntakeIdsByName" resultType="java.lang.Long">
+    SELECT id AS intakeId FROM pr_intake WHERE `name` = #{intakeName}
   </select>
+
+  <!--鍙栨按鍙e悕绉版崲鍙栨按鍙D锛岄獙璇佹槸鍚﹂噸澶嶅悕绉颁娇鐢�-->
+  <select id="getIntakeIdByNameExcludeId" resultType="java.lang.Long">
+    SELECT id AS intakeId FROM pr_intake WHERE id != #{id} and `name` = #{intakeName}
+  </select>
+
+
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0