Skip to content

T
tagManager
Commit 24e4b10a by zhangkb
Options

判断获取用户授予其他机构如果为空不加入组织list中

parent 2abe4c64
Showing with 20 additions and 11 deletions
src/main/java/com/keymobile/tagmanager/api/TagCtrl.java
...@@ -83,9 +83,10 @@ public class TagCtrl { ...@@ -83,9 +83,10 @@ public class TagCtrl {
orgIds.add(deptIdPath); orgIds.add(deptIdPath);
//获取当前用户被授予其他机构 //获取当前用户被授予其他机构
List<Long> deptList = GrantedAuthHelper.getUserGrantedOrgs(); List<Long> deptList = GrantedAuthHelper.getUserGrantedOrgs();
logger.info("granted Orgs:"+deptList); if(!deptList.isEmpty() && !"null".equals(deptList) && deptList!=null) {
for(Long dept : deptList) { for(Long dept : deptList) {
orgIds.add(String.valueOf(dept)); orgIds.add(String.valueOf(dept));
}
} }
return tagService.queryDimensionTagAsTree(orgIds, parentId); return tagService.queryDimensionTagAsTree(orgIds, parentId);
} }
...@@ -103,8 +104,10 @@ public class TagCtrl { ...@@ -103,8 +104,10 @@ public class TagCtrl {
orgIds.add(deptIdPath); orgIds.add(deptIdPath);
//获取当前用户被授予其他机构 //获取当前用户被授予其他机构
List<Long> deptList = GrantedAuthHelper.getUserGrantedOrgs(); List<Long> deptList = GrantedAuthHelper.getUserGrantedOrgs();
for(Long dept : deptList) { if(!deptList.isEmpty() && !"null".equals(deptList) && deptList!=null) {
orgIds.add(String.valueOf(dept)); for(Long dept : deptList) {
orgIds.add(String.valueOf(dept));
}
} }
//获取当前登录用户id //获取当前登录用户id
String userId = UserInfoUtils.getUserId(); String userId = UserInfoUtils.getUserId();
...@@ -127,8 +130,10 @@ public class TagCtrl { ...@@ -127,8 +130,10 @@ public class TagCtrl {
orgIds.add(deptIdPath); orgIds.add(deptIdPath);
//获取当前用户被授予其他机构 //获取当前用户被授予其他机构
List<Long> deptList = GrantedAuthHelper.getUserGrantedOrgs(); List<Long> deptList = GrantedAuthHelper.getUserGrantedOrgs();
for(Long dept : deptList) { if(!deptList.isEmpty() && !"null".equals(deptList) && deptList!=null) {
orgIds.add(String.valueOf(dept)); for(Long dept : deptList) {
orgIds.add(String.valueOf(dept));
}
} }
return tagService.searchPersonalDimensionTagByPage(userName, orgIds, keyword, return tagService.searchPersonalDimensionTagByPage(userName, orgIds, keyword,
path, domain, new Page(pageSize, pageNo)); path, domain, new Page(pageSize, pageNo));
...@@ -149,8 +154,10 @@ public class TagCtrl { ...@@ -149,8 +154,10 @@ public class TagCtrl {
orgIds.add(deptIdPath); orgIds.add(deptIdPath);
//获取当前用户被授予其他机构 //获取当前用户被授予其他机构
List<Long> deptList = GrantedAuthHelper.getUserGrantedOrgs(); List<Long> deptList = GrantedAuthHelper.getUserGrantedOrgs();
for(Long dept : deptList) { if(!deptList.isEmpty() && !"null".equals(deptList) && deptList!=null) {
orgIds.add(String.valueOf(dept)); for(Long dept : deptList) {
orgIds.add(String.valueOf(dept));
}
} }
return tagService.searchPersonalTagByPage(userName, orgIds, keyword, path, return tagService.searchPersonalTagByPage(userName, orgIds, keyword, path,
domain, new Page(pageSize, pageNo)); domain, new Page(pageSize, pageNo));
...@@ -186,8 +193,10 @@ public class TagCtrl { ...@@ -186,8 +193,10 @@ public class TagCtrl {
orgIds.add(deptIdPath); orgIds.add(deptIdPath);
//获取当前用户被授予其他机构 //获取当前用户被授予其他机构
List<Long> deptList = GrantedAuthHelper.getUserGrantedOrgs(); List<Long> deptList = GrantedAuthHelper.getUserGrantedOrgs();
for(Long dept : deptList) { if(!deptList.isEmpty() && !"null".equals(deptList) && deptList!=null) {
orgIds.add(String.valueOf(dept)); for(Long dept : deptList) {
orgIds.add(String.valueOf(dept));
}
} }
return tagService.queryPersonalTagExcludeOpenTypeAsTree(parentId, userName, orgIds); return tagService.queryPersonalTagExcludeOpenTypeAsTree(parentId, userName, orgIds);
} }
......
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