From 7a282d69e08d875a016975ea4b980bec98a9bab8 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 24 九月 2021 18:06:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/four_member' into four_member
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActCommitteeServiceImpl.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActCommitteeServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActCommitteeServiceImpl.java
index 2370c6f..7f7b2b3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActCommitteeServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActCommitteeServiceImpl.java
@@ -57,6 +57,7 @@
this.comActCommitteeDao.insert(comActCommittee);
return R.ok();
}
+ return R.fail(r.getMsg());
}
return R.fail();
}
@@ -82,12 +83,10 @@
AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
administratorsUserVO.setUserId(comActCommittee.getUserId());
administratorsUserVO.setCommunityId(comActCommittee.getCommunityId());
- R r=userService.deleteUserBackstage(administratorsUserVO);
- if(R.isOk(r)){
- this.comActCommitteeDao.deleteById(id);
- return R.ok();
- }
- return R.fail("账号删除失败");
+ userService.deleteUserBackstage(administratorsUserVO);
+ this.comActCommitteeDao.deleteById(id);
+ return R.ok();
+
}
}
return R.fail("用户账号错误");
--
Gitblit v1.7.1