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

src/main/java/com/keymobile/tagmanager/api/TagCtrl.java

@@ -83,9 +83,10 @@ public class TagCtrl {
 		orgIds.add(deptIdPath);
 		//获取当前用户被授予其他机构
 		List<Long> deptList = GrantedAuthHelper.getUserGrantedOrgs();
-		logger.info("granted Orgs:"+deptList);
-		for(Long dept : deptList) {
-			orgIds.add(String.valueOf(dept));
+		if(!deptList.isEmpty() && !"null".equals(deptList) && deptList!=null) {
+			for(Long dept : deptList) {
+				orgIds.add(String.valueOf(dept));
+			}
 		}
 		return tagService.queryDimensionTagAsTree(orgIds, parentId);
 	}
@@ -103,8 +104,10 @@ public class TagCtrl {
 		orgIds.add(deptIdPath);
 		//获取当前用户被授予其他机构
 		List<Long> deptList = GrantedAuthHelper.getUserGrantedOrgs();
-		for(Long dept : deptList) {
-			orgIds.add(String.valueOf(dept));
+		if(!deptList.isEmpty() && !"null".equals(deptList) && deptList!=null) {
+			for(Long dept : deptList) {
+				orgIds.add(String.valueOf(dept));
+			}
 		}
 		//获取当前登录用户id
 		String userId = UserInfoUtils.getUserId();
@@ -127,8 +130,10 @@ public class TagCtrl {
 		orgIds.add(deptIdPath);
 		//获取当前用户被授予其他机构
 		List<Long> deptList = GrantedAuthHelper.getUserGrantedOrgs();
-		for(Long dept : deptList) {
-			orgIds.add(String.valueOf(dept));
+		if(!deptList.isEmpty() && !"null".equals(deptList) && deptList!=null) {
+			for(Long dept : deptList) {
+				orgIds.add(String.valueOf(dept));
+			}
 		}
 		return tagService.searchPersonalDimensionTagByPage(userName, orgIds, keyword, 
 				path, domain, new Page(pageSize, pageNo));
@@ -149,8 +154,10 @@ public class TagCtrl {
 		orgIds.add(deptIdPath);
 		//获取当前用户被授予其他机构
 		List<Long> deptList = GrantedAuthHelper.getUserGrantedOrgs();
-		for(Long dept : deptList) {
-			orgIds.add(String.valueOf(dept));
+		if(!deptList.isEmpty() && !"null".equals(deptList) && deptList!=null) {
+			for(Long dept : deptList) {
+				orgIds.add(String.valueOf(dept));
+			}
 		}
 		return tagService.searchPersonalTagByPage(userName, orgIds, keyword, path, 
 				domain, new Page(pageSize, pageNo));
@@ -186,8 +193,10 @@ public class TagCtrl {
 		orgIds.add(deptIdPath);
 		//获取当前用户被授予其他机构
 		List<Long> deptList = GrantedAuthHelper.getUserGrantedOrgs();
-		for(Long dept : deptList) {
-			orgIds.add(String.valueOf(dept));
+		if(!deptList.isEmpty() && !"null".equals(deptList) && deptList!=null) {
+			for(Long dept : deptList) {
+				orgIds.add(String.valueOf(dept));
+			}
 		}
 		return tagService.queryPersonalTagExcludeOpenTypeAsTree(parentId, userName, orgIds);
 	}