|
@ -583,7 +583,18 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
|
|
|
return result;
|
|
|
}
|
|
|
//用户角色
|
|
|
RoleDO roleDO = roleDao.findOne(user.getRoleId());
|
|
|
List<RoleDO> roleDO =new ArrayList<>();
|
|
|
if (user.getRoleId().contains(",")){
|
|
|
String [] roleIds = user.getRoleId().split(",");
|
|
|
for (int i = 0; i <roleIds.length ; i++) {
|
|
|
RoleDO role = roleDao.findOne(roleIds[i]);
|
|
|
roleDO.add(role);
|
|
|
}
|
|
|
}else {
|
|
|
RoleDO roleOne = roleDao.findOne(user.getRoleId());
|
|
|
roleDO.add(roleOne);
|
|
|
}
|
|
|
|
|
|
|
|
|
//用户所属区域
|
|
|
List<WlyyUserAreaDO> userAreaDOList = userAreaDao.findAllByUserId(userId);
|