From beacd47b5a174b52602a7c4e4ee431aef4ab48b2 Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期五, 11 十二月 2020 18:02:28 +0800
Subject: [PATCH] 社区动态社区活动微心愿随手拍部分接口测试完成
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 11 +++--------
1 files changed, 3 insertions(+), 8 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 2602de8..199ceb2 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
@@ -12,6 +12,7 @@
import com.panzhihua.service_user.model.dos.SysRoleDO;
import com.panzhihua.service_user.model.dos.SysUserDO;
import com.panzhihua.service_user.service.UserService;
+import org.springframework.beans.BeanUtils;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
@@ -168,13 +169,7 @@
return R.fail();
}
LoginUserInfoVO loginUserInfoVO=new LoginUserInfoVO();
- loginUserInfoVO.setUserId(sysUserDO.getUserId());
- loginUserInfoVO.setName(sysUserDO.getName());
- loginUserInfoVO.setPassword(sysUserDO.getPassword());
- loginUserInfoVO.setStatus(sysUserDO.getStatus());
- loginUserInfoVO.setAccount(sysUserDO.getAccount());
- loginUserInfoVO.setType(sysUserDO.getType());
- loginUserInfoVO.setOpenid(sysUserDO.getOpenid());
+ BeanUtils.copyProperties(sysUserDO,loginUserInfoVO);
List<SysRoleDO> roleDOList=roleDAO.selectByUserId(sysUserDO.getUserId());
Set<String> set=new HashSet<>();
if (!ObjectUtils.isEmpty(roleDOList)) {
@@ -218,7 +213,7 @@
public R listActivityManager(String param, Long communityId) {
LambdaQueryWrapper<SysUserDO> queryWrapper=new LambdaQueryWrapper<>();
List<ActivityManagerVO> activityManagerVOS=new ArrayList<>();
- queryWrapper = new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getCommunityId, communityId).eq(SysUserDO::getStatus, 1);
+ queryWrapper = new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getCommunityId, communityId).eq(SysUserDO::getStatus, 1).eq(SysUserDO::getType,3);
if (!ObjectUtils.isEmpty(param)) {
queryWrapper = queryWrapper.eq(SysUserDO::getName, param);
}
--
Gitblit v1.7.1