From 1a987c8fd64413f04bdd0ea2bc8cb1b4262d4242 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期二, 15 六月 2021 11:03:24 +0800
Subject: [PATCH] Merge branch 'test_elder_cedoo' into test

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComEldersAuthElderlyMapper.xml                                        |    4 ++++
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComEldersAuthElderlyMapper.java               |    6 ++++++
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEldersAuthElderlyServiceImpl.java |    8 ++++++--
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComEldersAuthElderlyMapper.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComEldersAuthElderlyMapper.java
index 53b0639..8434ecc 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComEldersAuthElderlyMapper.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComEldersAuthElderlyMapper.java
@@ -30,4 +30,10 @@
 
 
     Integer updateEldersAuthElderly(ComEldersAuthElderlyDO comEldersAuthElderlyDO);
+
+    /**
+     * 根据老人库id删除绑定用户的关系
+     * @param elderId   老人库老人id
+     */
+    void deleteEldersAuthUserById(@Param("elderId") Long elderId);
 }
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEldersAuthElderlyServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEldersAuthElderlyServiceImpl.java
index 4ff8fed..0fee7d5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEldersAuthElderlyServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEldersAuthElderlyServiceImpl.java
@@ -157,7 +157,11 @@
 
     @Override
     public R deleteEldersAuthElderly(Long id) {
-        this.baseMapper.deleteById(id);
-        return R.ok();
+        if(this.baseMapper.deleteById(id) > 0){
+            //删除用户关联的老人信息
+            this.baseMapper.deleteEldersAuthUserById(id);
+            return R.ok();
+        }
+        return R.fail();
     }
 }
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComEldersAuthElderlyMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComEldersAuthElderlyMapper.xml
index 1681db0..8b18a6e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComEldersAuthElderlyMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComEldersAuthElderlyMapper.xml
@@ -101,4 +101,8 @@
 
 	</update>
 
+	<delete id="deleteEldersAuthUserById">
+		delete from com_elders_auth_user where big_age_id = #{elderId}
+	</delete>
+
 </mapper>

--
Gitblit v1.7.1