From 78d1c9ee9b0c49f77c29d0535cb93c6d62c42f3a Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 11 十一月 2021 13:58:25 +0800
Subject: [PATCH] 1111修改提交
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPropertyServiceImpl.java | 20 ++++++++++++++------
1 files changed, 14 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..fbfda6a 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("账号或手机号已存在");
}
return R.fail();
}
@@ -71,6 +74,14 @@
if(comPropertyVO!=null){
ComProperty comProperty=new ComProperty();
BeanUtils.copyProperties(comPropertyVO,comProperty);
+ if(comPropertyVO.getRoleId()!=null){
+ ComProperty comPropertyBase=this.comPropertyDao.selectById(comPropertyVO.getId());
+ AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
+ administratorsUserVO.setUserId(comPropertyBase.getUserId());
+ administratorsUserVO.setRoleId(comPropertyVO.getRoleId());
+ administratorsUserVO.setLastLoginTime(DateUtil.date());
+ this.userService.putUserBackstage(administratorsUserVO);
+ }
this.comPropertyDao.updateById(comProperty);
return R.ok();
}
@@ -85,12 +96,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