From cf2e6ce54f82c61606a01f816f7cac8b3a967809 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期三, 30 六月 2021 18:07:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 68 ++++++++++++++++++++++-----------
1 files changed, 45 insertions(+), 23 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 33d734b..41bd4a4 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();
@@ -1111,8 +1117,9 @@
* @return 协议集合
*/
@Override
- public R listAgreement() {
- List<SysUserAgreementDO> sysUserAgreementDOS = sysUserAgreementDAO.selectList(new LambdaQueryWrapper<>());
+ public R listAgreement(Long communityId) {
+ List<SysUserAgreementDO> sysUserAgreementDOS = sysUserAgreementDAO.selectList(new LambdaQueryWrapper<SysUserAgreementDO>()
+ .eq(SysUserAgreementDO::getCommunityId,communityId));
if (ObjectUtils.isEmpty(sysUserAgreementDOS)) {
return R.fail();
}
@@ -1150,7 +1157,7 @@
*/
@Override
public R listComMngUserTag(Long communityId) {
- List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO.selectList(new QueryWrapper<ComMngUserTagDO>().lambda().eq(ComMngUserTagDO::getCommunityId, communityId));
+ List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO.selectList(new QueryWrapper<ComMngUserTagDO>().or().lambda().eq(ComMngUserTagDO::getSysFlag,1).or().eq(ComMngUserTagDO::getCommunityId, communityId));
if (ObjectUtils.isEmpty(comMngUserTagDOS)) {
return R.fail();
}
@@ -1657,7 +1664,7 @@
@Override
public R getSysUserVOByPhone(String phone) {
- SysUserDO sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getPhone, phone));
+ SysUserDO sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getPhone, phone).eq(SysUserDO::getType,1));
if (ObjectUtils.isEmpty(sysUserDO)) {
return R.fail("用户不存在");
}
@@ -1907,7 +1914,13 @@
String encode = new BCryptPasswordEncoder().encode(eventGridMemberAddDTO.getPassword());
eventGridMemberAddDTO.setPassword(encode);
BeanUtils.copyProperties(eventGridMemberAddDTO, sysUserDO);
+ if(!StringUtils.isEmpty(sysUserDO.getNickName())){
+ sysUserDO.setName(sysUserDO.getNickName());
+ }
sysUserDO.setType(6);
+ if(StringUtils.isEmpty(eventGridMemberAddDTO.getImageUrl())){
+ sysUserDO.setImageUrl(Constants.ZONG_ZHI_GRID_MEMBER_IMAGE_URL);
+ }
int insert = 0;
try {
insert = userDao.insert(sysUserDO);
@@ -1919,9 +1932,9 @@
e.printStackTrace();
log.error("新增后台用户报错【{}】", e.getMessage());
if (e.getMessage().contains("union_phone_type")) {
- throw new ServiceException("手机号已经存在");
+ return R.fail("手机号已经存在");
} else if (e.getMessage().contains("union_account_type")) {
- throw new ServiceException("账户已经存在");
+ return R.fail("账户已经存在");
}
}
if(insert > 0){
@@ -1947,7 +1960,7 @@
* @return 修改结果
*/
@Override
- public R editGridUser(EventGridMemberAddDTO gridMemberDTO){
+ public R editGridUser(EventGridMemberEditAdminDTO gridMemberDTO){
if(gridMemberDTO.getGridMemberId() == null){
return R.fail("参数错误");
@@ -1965,8 +1978,6 @@
return R.fail("昵称已使用");
}
- String encode = new BCryptPasswordEncoder().encode(gridMemberDTO.getPassword());
- gridMemberDTO.setPassword(encode);
BeanUtils.copyProperties(gridMemberDTO,sysUserDO);
int insert = 0;
@@ -1976,9 +1987,9 @@
e.printStackTrace();
log.error("修改网格员用户报错【{}】", e.getMessage());
if (e.getMessage().contains("union_phone_type")) {
- throw new ServiceException("手机号已经存在");
+ return R.fail("手机号已经存在");
} else if (e.getMessage().contains("union_account_type")) {
- throw new ServiceException("账户已经存在");
+ return R.fail("账户已经存在");
}
}
if(insert > 0){
@@ -2027,4 +2038,15 @@
userDao.gridMemberEditStatus(gridMemberEditDTO);
return R.ok();
}
+
+ public R noTips(Long userId){
+ SysUserDO userDO = this.userDao.selectById(userId);
+ if(userDO != null){
+ userDO.setBigAgeTips(2);
+ if(this.userDao.updateById(userDO) > 0){
+ return R.ok();
+ }
+ }
+ return R.fail();
+ }
}
--
Gitblit v1.7.1