Commit bc0bdd91 by zhangkb

修改获取维度根目录接口

parent 292ca6e9
......@@ -305,23 +305,17 @@ public class TagCtrl {
@ApiOperation(value = "(2020-7-21)获取所有根目录维度标签", notes = "(2020-7-21)获取所有根目录维度标签")
@PostMapping(value = "/getAllDimensionRootTag")
public List<Map<String,Object>> getAllDimensionRootTag(){
Long deptId = GrantedAuthHelper.getUserOrg();
if(deptId==null) {
public List<Map<String,Object>> getAllDimensionRootTag(@RequestBody List<Long> orgIds){
List<String> orgIdsList = new ArrayList<>();
if(orgIds.isEmpty()) {
logger.info("获取用户机构为空");
}
String deptIdPath = /**UserInfoUtils.getDataRoleOrg()*/String.valueOf(GrantedAuthHelper.getUserOrg());
//考虑一个用户对应多个机构的情况
List<String> orgIds = new ArrayList<>();
orgIds.add(deptIdPath);
//获取当前用户被授予其他机构
List<Long> deptList = GrantedAuthHelper.getUserGrantedOrgs();
if(deptList!=null) {
for(Long dept : deptList) {
orgIds.add(String.valueOf(dept));
}else {
for(Long orgId : orgIds) {
orgIdsList.add(String.valueOf(orgId));
}
return tagService.getDimensionRootTag(orgIdsList);
}
return tagService.getDimensionRootTag(orgIds);
return new ArrayList<>();
}
//---------------以下为导入系统的时候用到------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment