From 14e95631f075f951a44033faeab3075bb05eda1d Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 13 五月 2025 14:57:47 +0800
Subject: [PATCH] 解决问题：取水口解绑之后，不能获取取水口详情信息。
---
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java | 5 +++--
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml | 8 +++-----
2 files changed, 6 insertions(+), 7 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 73fcad0..01b3bcf 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
@@ -55,16 +55,14 @@
con.rtuAddr,
con.protocol
FROM pr_intake ge
- INNER JOIN pr_divide divi ON ge.divideId = divi.id
- INNER JOIN ba_block blo ON divi.blockId = blo.id
+ LEFT JOIN pr_divide divi ON ge.divideId = divi.id
+ LEFT JOIN ba_block blo ON divi.blockId = blo.id
LEFT JOIN ba_district country ON ge.countyId = country.id
LEFT JOIN ba_district town ON ge.townId = town.id
LEFT JOIN ba_district village ON ge.villageId = village.id
- INNER JOIN pr_controller con ON con.intakeId = ge.id
+ LEFT JOIN pr_controller con ON con.intakeId = ge.id
where ge.id = #{id,jdbcType=BIGINT}
AND ge.deleted = 0
- AND divi.deleted = 0
- AND blo.deleted = 0
</select>
<delete id="deleteLogicById" parameterType="java.lang.Long">
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 399d528..e2ef459 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
@@ -106,10 +106,11 @@
@GetMapping(path = "one")
@SsoAop()
public BaseResponse<VoAllIntake> one(@RequestParam("id") Long id) {
- if (this.intakeSv.selectById(id) == null) {
+ VoAllIntake po = this.intakeSv.selectById(id) ;
+ if (po == null) {
return BaseResponseUtils.buildErrorMsg(ProjectResultCode.NO_INTAKES.getMessage());
} else {
- return BaseResponseUtils.buildSuccess(this.intakeSv.selectById(id));
+ return BaseResponseUtils.buildSuccess(po);
}
}
--
Gitblit v1.8.0