From 75206d4e4ecd2a7789a21362b85906463d3f2c3d Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 27 十二月 2021 10:08:13 +0800
Subject: [PATCH] Merge branch 'master' into hemenkou_dev
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java
index b40fda8..e80ef41 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java
@@ -63,6 +63,7 @@
return R.fail("社区已经存在");
}
BeanUtils.copyProperties(comActVO, comActDO);
+ comActDO.setPlaintextPassword(password);
int insert = comActDAO.insert(comActDO);
if (insert > 0) {
ComActDO comActDO1 =
@@ -91,6 +92,7 @@
if (!ObjectUtils.isEmpty(password)) {
String encode = new BCryptPasswordEncoder().encode(password);
comActVO.setPassword(encode);
+ comActDO.setPlaintextPassword(password);
a = 1;
}
ComStreetDO comStreetDO = comStreetDAO.selectById(comActVO.getStreetId());
@@ -101,7 +103,6 @@
// a=1;
// }
BeanUtils.copyProperties(comActVO, comActDO);
-
// ComActDO selectOne = comActDAO.selectOne(new QueryWrapper<ComActDO>().lambda().eq(ComActDO::getAccount, account));
// if (null != selectOne && selectOne.getAccount().equals(comActVO.getAccount())) {
// return R.fail("该登录账号重复，请重新修改");
@@ -219,6 +220,11 @@
return R.ok(this.comActDAO.getCommunityLists());
}
+ @Override
+ public R getWestCommunityLists() {
+ return R.ok(this.comActDAO.getWestCommunityLists());
+ }
+
/**
* 查询社区所有列表
*
@@ -266,4 +272,9 @@
return R.ok(this.comActDAO.getCommunityListByNearby(communityDTO));
}
+ @Override
+ public R getCommunityPassword(Long communityId){
+ return R.ok(comActDAO.getCommunityPassword(communityId));
+ }
+
}
--
Gitblit v1.7.1