加判断当前用户机构为空的情况

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

@@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.keymobile.auth.common.security.GrantedAuthHelper;
 import com.keymobile.tagmanager.exception.TagNotExistException;
+import com.keymobile.tagmanager.model.ExtTag;
 import com.keymobile.tagmanager.model.Page;
 import com.keymobile.tagmanager.model.SysTag;
 import com.keymobile.tagmanager.model.Tag;
@@ -76,6 +77,11 @@ public class TagCtrl {
 	public JsonNode[] queryDimensionTagAsTree(
 			@RequestParam(value = "parentId", required = false) String parentId,
 			@RequestParam(required = false) String deptIdPath) throws TagNotExistException   {
+		Long deptId = GrantedAuthHelper.getUserOrg();
+		if(deptId==null) {
+			logger.info("获取用户机构为空");
+			return new JsonNode[] {};
+		}
 		//获取当前登录用户机构
 		deptIdPath = /**UserInfoUtils.getDataRoleOrg()*/String.valueOf(GrantedAuthHelper.getUserOrg());
 		//考虑一个用户对应多个机构的情况
@@ -96,6 +102,11 @@ public class TagCtrl {
 	public JsonNode[] queryPersonalTagAsTree(
 			@RequestParam(value = "parentId", required = false) String parentId,
 			@RequestParam(required = false) String deptIdPath) throws TagNotExistException {
+		Long deptId = GrantedAuthHelper.getUserOrg();
+		if(deptId==null) {
+			logger.info("获取用户机构为空");
+			return new JsonNode[] {};
+		}
 		//获取当前登录用户机构id
 		deptIdPath = /**UserInfoUtils.getDataRoleOrg()*/String.valueOf(GrantedAuthHelper.getUserOrg());
 		logger.info("personalDept:"+deptIdPath);
@@ -124,6 +135,14 @@ public class TagCtrl {
    			@RequestParam("pageNo") Integer pageNo,
    			@RequestParam("pageSize") Integer pageSize) throws TagNotExistException{
 		String userName = UserInfoUtils.getUserId();
+		Long deptId = GrantedAuthHelper.getUserOrg();
+		if(deptId==null) {
+			logger.info("获取用户机构为空");
+			Page page = new Page(pageSize, pageNo);
+			page.setData(new ArrayList<ExtTag>());
+			page.setTotal(0L);
+			return page;
+		}
 		deptIdPath = /**UserInfoUtils.getDataRoleOrg()*/String.valueOf(GrantedAuthHelper.getUserOrg());
 		//考虑一个用户对应多个机构的情况
 		List<String> orgIds = new ArrayList<>();
@@ -148,6 +167,14 @@ public class TagCtrl {
    			@RequestParam("pageNo") Integer pageNo,
    			@RequestParam("pageSize") Integer pageSize) throws TagNotExistException{
 		String userName = UserInfoUtils.getUserId();
+		Long deptId = GrantedAuthHelper.getUserOrg();
+		if(deptId==null) {
+			logger.info("获取用户机构为空");
+			Page page = new Page(pageSize, pageNo);
+			page.setData(new ArrayList<ExtTag>());
+			page.setTotal(0L);
+			return page;
+		}
 		deptIdPath =/**UserInfoUtils.getDataRoleOrg()*/String.valueOf(GrantedAuthHelper.getUserOrg());
 		//考虑一个用户对应多个机构的情况
 		List<String> orgIds = new ArrayList<>();
@@ -187,6 +214,11 @@ public class TagCtrl {
 			@RequestParam(value = "parentId", required = false) String parentId,
 			@RequestParam(required = false) String deptIdPath) throws TagNotExistException  {
 		String userName = UserInfoUtils.getUserId();
+		Long deptId = GrantedAuthHelper.getUserOrg();
+		if(deptId==null) {
+			logger.info("获取用户机构为空");
+			return new JsonNode[] {};
+		}
 		deptIdPath = /**UserInfoUtils.getDataRoleOrg()*/String.valueOf(GrantedAuthHelper.getUserOrg());
 		//考虑一个用户对应多个机构的情况
 		List<String> orgIds = new ArrayList<>();