From 07efb777b4d17c42835f026f8450dfdf64660204 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期五, 28 六月 2024 08:49:30 +0800
Subject: [PATCH] 修改 控制器删除接口为物理删除，返回上次取水口查询改动
---
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerSv.java | 4 ++--
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml | 2 --
2 files changed, 2 insertions(+), 4 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 939f3f1..2ee04fa 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
@@ -224,7 +224,6 @@
ge.deleted = 0
AND divi.deleted = 0
and blo.deleted = 0
- and cont.deleted = 0
<if test="intakeName != null and intakeName != ''">
AND ge.name LIKE CONCAT('%', #{intakeName}, '%')
</if>
@@ -284,7 +283,6 @@
ge.deleted = 0
AND divi.deleted = 0
and blo.deleted = 0
- and cont.deleted = 0
<if test="intakeName != null and intakeName != ''">
AND ge.name LIKE CONCAT('%', #{intakeName}, '%')
</if>
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerSv.java
index e21fdae..a6bbf1c 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerSv.java
@@ -132,13 +132,13 @@
}
/**
- * 鏍规嵁鎺у埗鍣ㄧ紪鍙烽�昏緫鍒犻櫎鎺у埗
+ * 鏍规嵁鎺у埗鍣ㄧ紪鍙风墿鐞嗗垹闄ゆ帶鍒�
*
* @param controllerId
* @return
*/
public Integer deleteControllerById(Long controllerId) {
- return prControllerMapper.deleteControllerById(controllerId);
+ return prControllerMapper.deleteByPrimaryKey(controllerId);
}
/**
--
Gitblit v1.8.0