From 28403e0caa43764d861fa5a8bb08f7b37868d2fa Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期六, 05 六月 2021 17:52:03 +0800
Subject: [PATCH] Merge branch 'test_future_wangge' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 34 +++++++++++++++++++---------------
1 files changed, 19 insertions(+), 15 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 4dbdf3a..1deb1b6 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
@@ -11,10 +11,7 @@
import com.panzhihua.common.model.dtos.PageDTO;
import com.panzhihua.common.model.dtos.community.ExportUserDTO;
import com.panzhihua.common.model.dtos.community.NoticeReadDTO;
-import com.panzhihua.common.model.dtos.grid.EventGridMemberAddDTO;
-import com.panzhihua.common.model.dtos.grid.EventGridMemberEditStatusDTO;
-import com.panzhihua.common.model.dtos.grid.EventGridMemberPassResetDTO;
-import com.panzhihua.common.model.dtos.grid.PageEventGridMemberRelationDTO;
+import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.dtos.user.*;
import com.panzhihua.common.model.vos.*;
import com.panzhihua.common.model.vos.community.ComActVO;
@@ -240,6 +237,12 @@
// 志愿者状态
String phone = sysUserDO.getPhone();
Long userCommunityId = sysUserDO.getCommunityId();
+ if(userCommunityId!=null){
+ ComActVO comActVO = userDao.selectCommunity(userCommunityId);
+ if(comActVO!=null) {
+ loginUserInfoVO.setCommunityName(comActVO.getName());
+ }
+ }
if (!ObjectUtils.isEmpty(phone)) {
ComMngVolunteerMngVO comMngVolunteerMngVO = userDao.selectVolunteerMngByPhone(phone);
if (ObjectUtils.isEmpty(comMngVolunteerMngVO)) {
@@ -951,14 +954,17 @@
// 获取所有权限id
List<SysMenuDO> menuDOList = sysMenuDAO.selectList(new QueryWrapper<SysMenuDO>().lambda().eq(SysMenuDO::getCommunityId, 2l).orderByAsc(SysMenuDO::getOrderNum));
- menuIds = menuDOList.stream().map(sysMenuDO -> sysMenuDO.getMenuId()).collect(Collectors.toList());
- for (int i = 0; i < menuIds.size(); i++) {
- SysRoleMenuDO sysRoleMenuDO = sysRoleMenuDAO.selectOne(new QueryWrapper<SysRoleMenuDO>().lambda().eq(SysRoleMenuDO::getMenuId,menuIds.get(i))
- .eq(SysRoleMenuDO::getRoleId,roleId));
- if(sysRoleMenuDO == null){
- sysRoleMenuDO.setMenuId(menuIds.get(i));
- sysRoleMenuDO.setRoleId(roleId);
- sysRoleMenuDAO.insert(sysRoleMenuDO);
+ if(!menuDOList.isEmpty()){
+ menuIds = menuDOList.stream().map(sysMenuDO -> sysMenuDO.getMenuId()).collect(Collectors.toList());
+ for (int i = 0; i < menuIds.size(); i++) {
+ SysRoleMenuDO sysRoleMenuDO = sysRoleMenuDAO.selectOne(new QueryWrapper<SysRoleMenuDO>().lambda().eq(SysRoleMenuDO::getMenuId,menuIds.get(i))
+ .eq(SysRoleMenuDO::getRoleId,roleId));
+ if(sysRoleMenuDO == null){
+ sysRoleMenuDO = new SysRoleMenuDO();
+ sysRoleMenuDO.setMenuId(menuIds.get(i));
+ sysRoleMenuDO.setRoleId(roleId);
+ sysRoleMenuDAO.insert(sysRoleMenuDO);
+ }
}
}
return R.ok();
@@ -1947,7 +1953,7 @@
* @return 修改结果
*/
@Override
- public R editGridUser(EventGridMemberAddDTO gridMemberDTO){
+ public R editGridUser(EventGridMemberEditAdminDTO gridMemberDTO){
if(gridMemberDTO.getGridMemberId() == null){
return R.fail("参数错误");
@@ -1965,8 +1971,6 @@
return R.fail("昵称已使用");
}
- String encode = new BCryptPasswordEncoder().encode(gridMemberDTO.getPassword());
- gridMemberDTO.setPassword(encode);
BeanUtils.copyProperties(gridMemberDTO,sysUserDO);
int insert = 0;
--
Gitblit v1.7.1