From a12e09a5bc73672dcd4665d35a1ef8c9d1c534b0 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 16 十月 2023 18:47:11 +0800
Subject: [PATCH] 修改三说会堂
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 d30c703..484bdde 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
@@ -802,12 +802,14 @@
* @return 人员详情
*/
@Override
- public R<LoginUserInfoVO> detailUser(Long userId) {
+ public R<LoginUserInfoVO> detailUser(Long userId)
+ {
LoginUserInfoVO loginUserInfoVO = new LoginUserInfoVO();
SysUserDO sysUserDO = userDao.selectById(userId);
if (ObjectUtils.isEmpty(sysUserDO)) {
return R.fail("人员不存在");
}
+
BeanUtils.copyProperties(sysUserDO, loginUserInfoVO);
List<ComMngFamilyInfoDO> comMngFamilyInfoDOS = comMngFamilyInfoDAO
.selectList(new QueryWrapper<ComMngFamilyInfoDO>().lambda().eq(ComMngFamilyInfoDO::getUserId, userId));
@@ -898,8 +900,10 @@
SysUserRoleDO sysUserRoleDO=sysUserRoleDAO.selectOne(new QueryWrapper<SysUserRoleDO>()
.lambda().eq(SysUserRoleDO::getUserId,sysUserDO.getUserId()));
- loginUserInfoVO.setRoleId(sysUserRoleDO.getRoleId().toString());
-
+ if(sysUserRoleDO!=null )
+ {
+ loginUserInfoVO.setRoleId(sysUserRoleDO.getRoleId()+"");
+ }
return R.ok(loginUserInfoVO);
}
--
Gitblit v1.7.1