From 673fb798866d5f80bcd6c516dd27de8f27306a33 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期一, 31 五月 2021 13:14:40 +0800
Subject: [PATCH] add:社区列表
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
index 88209fa..197facb 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -585,7 +585,7 @@
public R putUserCommunityArea(LoginUserInfoVO loginUserInfoVO) {
SysUserDO sysUserDO = new SysUserDO();
sysUserDO.setCommunityId(loginUserInfoVO.getCommunityId());
- sysUserDO.setAreaId(loginUserInfoVO.getAreaId());
+// sysUserDO.setAreaId(loginUserInfoVO.getAreaId());
sysUserDO.setUserId(loginUserInfoVO.getUserId());
int update = userDao.updateById(sysUserDO);
if (update > 0) {
@@ -609,9 +609,13 @@
String idCard = loginUserInfoVO.getIdCard();
String name = loginUserInfoVO.getName();
log.info("用户实名认证发送请求，姓名：" + name + "身份证号码：" + idCard);
- boolean b = RealNameUtil.authentication(idCard, name);
- if (!b) {
- return R.fail("身份认证失败：请填写真实信息");
+ try {
+ boolean b = RealNameUtil.authentication(idCard, name);
+ if (!b) {
+ return R.fail("身份认证失败：请填写真实信息");
+ }
+ }catch (ServiceException serviceException){
+ return R.fail(serviceException.getMessage());
}
SysUserDO sysUserDO = new SysUserDO();
sysUserDO.setName(name);
@@ -751,7 +755,7 @@
@Override
public R listFamily(Long userId,Long pageNum, Long pageSize) {
List<ComMngFamilyInfoVO> comMngFamilyInfoVOS = new ArrayList<>();
- LambdaQueryWrapper<ComMngFamilyInfoDO> query = new QueryWrapper<ComMngFamilyInfoDO>().lambda().eq(ComMngFamilyInfoDO::getUserId, userId);
+ LambdaQueryWrapper<ComMngFamilyInfoDO> query = new QueryWrapper<ComMngFamilyInfoDO>().lambda().eq(ComMngFamilyInfoDO::getUserId, userId).orderByDesc(ComMngFamilyInfoDO::getCreateAt);
IPage<ComMngFamilyInfoDO> pageData = comMngFamilyInfoDAO.selectPage(new Page<>(pageNum,pageSize), query);
if (!ObjectUtils.isEmpty(pageData.getRecords())) {
pageData.getRecords().forEach(comMngFamilyInfoDO -> {
--
Gitblit v1.7.1