From 35c4c4461ade290fd2152969d279ac9a5cbacd4a Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期一, 25 一月 2021 14:49:49 +0800
Subject: [PATCH] 通知
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 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 45ce643..26b6724 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
@@ -13,6 +13,7 @@
import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO;
import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO;
import com.panzhihua.common.model.vos.*;
+import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO;
import com.panzhihua.common.model.vos.partybuilding.ActivityManagerVO;
import com.panzhihua.common.model.vos.user.*;
@@ -411,6 +412,8 @@
});
loginUserInfoVO.setComMngFamilyInfoVOS(comMngFamilyInfoVOS);
}
+ ComActVO comActVO=userDao.selectCommunity(loginUserInfoVO.getCommunityId());
+ loginUserInfoVO.setCommunityName(comActVO.getName());
return R.ok(loginUserInfoVO);
}
@@ -1163,10 +1166,15 @@
List<SysUserNoticeVO> sysUserNoticeVOList=new ArrayList<>();
List<SysUserNoticeDO> sysUserNoticeDOS = sysUserNoticeDAO.selectList(new QueryWrapper<SysUserNoticeDO>().lambda().eq(SysUserNoticeDO::getUserId, userId).orderByDesc(SysUserNoticeDO::getCreateAt));
if (!ObjectUtils.isEmpty(sysUserNoticeDOS)) {
+ List<Integer> typeList=new ArrayList<>(4);
sysUserNoticeDOS.forEach(sysUserNoticeDO -> {
- SysUserNoticeVO sysUserNoticeVO=new SysUserNoticeVO();
- BeanUtils.copyProperties(sysUserNoticeDO,sysUserNoticeVO);
- sysUserNoticeVOList.add(sysUserNoticeVO);
+ Integer type = sysUserNoticeDO.getType();
+ if (!typeList.contains(type)) {
+ SysUserNoticeVO sysUserNoticeVO=new SysUserNoticeVO();
+ BeanUtils.copyProperties(sysUserNoticeDO,sysUserNoticeVO);
+ sysUserNoticeVOList.add(sysUserNoticeVO);
+ typeList.add(type);
+ }
});
}
noticeUnReadVO.setSysUserNoticeVOList(sysUserNoticeVOList);
@@ -1298,13 +1306,13 @@
public static void main(String[] args) {
- String encode = new BCryptPasswordEncoder().encode("admin123456");
+ String encode = new BCryptPasswordEncoder().encode("lbsq123456");
System.out.println(encode);
- BCryptPasswordEncoder encoder = new BCryptPasswordEncoder();
- boolean matches = encoder.matches("admin1234567", encode);
- System.out.println(matches);
+// BCryptPasswordEncoder encoder = new BCryptPasswordEncoder();
+// boolean matches = encoder.matches("admin1234567", encode);
+// System.out.println(matches);
}
}
--
Gitblit v1.7.1