From 4404590777ee7b17150153bdd7e688c9d666e28f Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期一, 25 一月 2021 13:50:15 +0800
Subject: [PATCH] 微心愿
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 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 bb81750..a599fad 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
@@ -338,7 +338,8 @@
}
int num=0;
if (operationType==3) {
- num=userDao.deleteById(userId);
+// num=userDao.deleteById(userId);
+ num=userDao.updateFaceState(userId);
} else {
num=userDao.updateById(sysUserDO);
}
@@ -736,7 +737,7 @@
Integer isAll = menuRoleVO.getIsAll();
Long communityId = menuRoleVO.getCommunityId();
if (isAll.intValue()==1) {
- List<SysMenuDO> sysMenuDOS = sysMenuDAO.selectList(new QueryWrapper<SysMenuDO>().lambda().eq(SysMenuDO::getCommunityId, 1l).eq(SysMenuDO::getParentId,0).orderByAsc(SysMenuDO::getOrderNum));
+ List<SysMenuDO> sysMenuDOS = sysMenuDAO.selectList(new QueryWrapper<SysMenuDO>().lambda().eq(SysMenuDO::getCommunityId, 2l).eq(SysMenuDO::getParentId,0).orderByAsc(SysMenuDO::getOrderNum));
Long menuIdParent = sysMenuDOS.get(1).getMenuId();
List<SysMenuDO> sysMenuDOSErJi = sysMenuDAO.selectList(new QueryWrapper<SysMenuDO>().lambda().eq(SysMenuDO::getParentId, menuIdParent));
if (!ObjectUtils.isEmpty(sysMenuDOS)) {
@@ -1160,12 +1161,17 @@
public R noticeUnreadNum(Long userId) {
NoticeUnReadVO noticeUnReadVO=sysUserNoticeDAO.noticeUnreadNum(userId);
List<SysUserNoticeVO> sysUserNoticeVOList=new ArrayList<>();
- List<SysUserNoticeDO> sysUserNoticeDOS = sysUserNoticeDAO.selectList(new QueryWrapper<SysUserNoticeDO>().lambda().eq(SysUserNoticeDO::getUserId, userId).orderByDesc(SysUserNoticeDO::getCreateAt).groupBy(SysUserNoticeDO::getType));
+ 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);
@@ -1297,13 +1303,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