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/ComPropertyServiceImpl.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPropertyServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPropertyServiceImpl.java
index 1134f24..d96bb49 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPropertyServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPropertyServiceImpl.java
@@ -55,6 +55,8 @@
administratorsUserVO.setRoleId(comPropertyVO.getRoleId());
administratorsUserVO.setCommunityId(comPropertyVO.getCommunityId());
administratorsUserVO.setAreaId(comPropertyVO.getAreaId());
+ administratorsUserVO.setName(comPropertyVO.getContactName());
+ administratorsUserVO.setPhone(comPropertyVO.getPhone());
R r=userService.addUserBackstageProperty(administratorsUserVO);
if(R.isOk(r)){
comProperty.setUserId(Long.parseLong(r.getData().toString()));
@@ -62,6 +64,7 @@
this.comPropertyDao.insert(comProperty);
return R.ok();
}
+ return R.fail(r.getMsg());
}
return R.fail();
}
@@ -85,12 +88,9 @@
AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
administratorsUserVO.setUserId(comProperty.getUserId());
administratorsUserVO.setCommunityId(comProperty.getCommunityId());
- R r=userService.deleteUserBackstage(administratorsUserVO);
- if(R.isOk(r)){
- this.comPropertyDao.deleteById(id);
- return R.ok();
- }
- return R.fail("账号删除失败");
+ userService.deleteUserBackstage(administratorsUserVO);
+ this.comPropertyDao.deleteById(id);
+ return R.ok();
}
}
return R.fail("用户账号错误");
--
Gitblit v1.7.1