From dd07cafb1604f528fbb7a04a79fc89b55198e080 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: Mon, 08 Jul 2024 16:24:15 +0800
Subject: [PATCH] 电子围栏挂接bug修改提交
---
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankWallLockServiceImpl.java | 8 ++++++++
ard-work/src/main/resources/mapper/sy/ArdTankWallLockMapper.xml | 4 ++++
ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankWallLockMapper.java | 2 ++
3 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankWallLockMapper.java b/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankWallLockMapper.java
index e103c21..606a5f0 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankWallLockMapper.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankWallLockMapper.java
@@ -67,4 +67,6 @@
public int updateArdTankWallLockByWallIdAndLockId(ArdTankWallLock ardTankWallLock);
public int deleteArdTankWallLockByLockIdAndOtherIds(@Param("lockId")String lockId,@Param("idList")List<String> idList);
+
+ public List<ArdTankWallLock> selectArdTankWallLockByLockId(String lockId);
}
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankWallLockServiceImpl.java b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankWallLockServiceImpl.java
index 0f41760..603ad0f 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankWallLockServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankWallLockServiceImpl.java
@@ -98,6 +98,14 @@
public int insertWallLock(Map<String, Object> para) {
String id = (String) para.get("id");//锁主键
List<Map<String,String>> tankWallLockList = (List<Map<String, String>>) para.get("tankWallLockList");
+ if(tankWallLockList.size() == 0){//数组为空，做删除操作
+ List<ArdTankWallLock> ardTankWallLockList = ardTankWallLockMapper.selectArdTankWallLockByLockId(id);//查询之前挂接的电子围栏
+ if(ardTankWallLockList.size() == 0){//若没有挂接，不做操作
+ return 1;
+ }
+ int result = ardTankWallLockMapper.deleteArdTankWallLockByLockId(id);
+ return result;
+ }
//List<ArdTankWallLock> tankWallLocks = new ArrayList();
List<String> idList = new ArrayList();//存放新增和修改的中间表主键
int result = 0;
diff --git a/ard-work/src/main/resources/mapper/sy/ArdTankWallLockMapper.xml b/ard-work/src/main/resources/mapper/sy/ArdTankWallLockMapper.xml
index eefcc7c..761286d 100644
--- a/ard-work/src/main/resources/mapper/sy/ArdTankWallLockMapper.xml
+++ b/ard-work/src/main/resources/mapper/sy/ArdTankWallLockMapper.xml
@@ -90,4 +90,8 @@
#{mid}
</foreach>
</delete>
+
+ <select id="selectArdTankWallLockByLockId" parameterType="java.lang.String" resultMap="ArdTankWallLockResult">
+ select * from ard_tank_wall_lock where lock_id = #{lockId}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3