From fb028efebb22fd220d911b76ef977362f7ad4afc Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 16 Jun 2021 14:05:14 +0800 Subject: [PATCH] roles --- .../screen/impl/ScreenProjectServiceImpl.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java index 74b013b653..81a854c5de 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java @@ -1,6 +1,5 @@ package com.epmet.datareport.service.evaluationindex.screen.impl; -import com.alibaba.fastjson.JSON; import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.utils.ConvertUtils; @@ -33,7 +32,6 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -120,11 +118,10 @@ public class ScreenProjectServiceImpl implements ScreenProjectService { Result userRoles = userOpenFeignClient.getUserRoles(userRoleFormDTO); if (userRoles != null && userRoles.success() && userRoles.getData() != null){ - String roles = userRoles.getData().getRoles(); + Map roles = userRoles.getData().getRoles(); - if (StringUtils.isNotBlank(roles)){ - Map map = JSON.parseObject(roles, HashMap.class); - item.setReportUserRoleSet(map.keySet()); + if (!CollectionUtils.isEmpty(roles)){ + item.setReportUserRoleSet(roles.keySet()); } } }