修改获取维度标签接口

src/main/java/com/keymobile/tagmanager/service/TagService.java

@@ -263,25 +263,7 @@ public class TagService {
 	public JsonNode[] queryPersonalTagExcludeOpenTypeAsTree(String parentId, String userName, String dept) throws TagNotExistException {
 		List<Tag> tags = new ArrayList<>();
 		//根据普通用户机构id获取机构信息
-		Org org = authService.getOrgs(dept);
-		if(org==null) {
-			throw new TagNotExistException("get org by id error;");
-		}
-		//获取机构fullname
-		String fullname = org.getFullName();
-		//分隔fullname
-		String[] fullnames = fullname.split(",");
-		//如果fullname没有两层结构
-		if(fullnames.length<2) {
-			throw new TagNotExistException("get org by id the fullname:"+fullname+" at least 2 level;");
-		}
-		String companyPath = fullnames[0]+Constants.TAG_PATH_SEPARATOR+fullnames[1];
-		//根据companyPath获取机构信息
-		Org companyOrg = authService.findByFullName(companyPath);
-		if(companyOrg==null) {
-			throw new TagNotExistException("get company org by fullname is null;");
-		}
-		String companyOrgId = String.valueOf(companyOrg.getId());
+		String companyOrgId = this.getCompanyOrgIdByUserOrgId(dept);
 		if (StringUtils.isEmpty(parentId)) {
 			tags = mongoOperations.find(createPersonalExcludeOpenTypeTagQuery(userName, companyOrgId), Tag.class);
 		} 
@@ -351,7 +333,7 @@ public class TagService {
 	private Query createDimensionTagQuery(String dept) {
 		return Query.query(Criteria.where("dimensionType").is(Constants.TAG_DIMENSION_TRUE)
 				.and("tagType").is(Constants.TAG_PERSONAL_TYPE)
-				.and("dept").is(dept))
+				.and("proDept").is(dept))
 				.with(Sort.by(getDefaultTagOrders()));
 	}
 	//根据机构获取当前维度标签的所有子标签
@@ -359,7 +341,7 @@ public class TagService {
     	List<Tag> dirs = mongoOperations.find(new Query().addCriteria(Criteria.where("path")
     			.regex("^"+parentTag.getPath() + Constants.TAG_PATH_SEPARATOR)
     			.and("dimensionType").is(Constants.TAG_DIMENSION_TRUE)
-    			.and("dept").is(companyOrgId))
+    			.and("proDept").is(companyOrgId))
     			.with(Sort.by(getDefaultTagOrders())), Tag.class);
 		dirs.add(parentTag);
 		return dirs;
@@ -376,7 +358,7 @@ public class TagService {
 			String companyId) {
 		Criteria criteria = Criteria.where("tagType").is("1");//获取自定义标签
 		criteria.orOperator(
-				Criteria.where("dept").is(companyId)
+				Criteria.where("proDept").is(companyId)
 					.and("dimensionType").is(Constants.TAG_DIMENSION_TRUE),//标签是维度管理员机构的
 				Criteria.where("dept").is(deptId).and("tagUser").is(userId),//标签是普通用户结构且普通用户名创建
 				Criteria.where("proDept").is(companyId)
@@ -392,7 +374,7 @@ public class TagService {
     			.regex("^"+parentTag.getPath() + Constants.TAG_PATH_SEPARATOR)
     			.and("tagType").is(Constants.TAG_PERSONAL_TYPE)
     			.orOperator(
-    					Criteria.where("dept").is(companyId)
+    					Criteria.where("proDept").is(companyId)
     					.and("dimensionType").is(Constants.TAG_DIMENSION_TRUE),//标签是维度管理员机构的
     					Criteria.where("dept").is(deptId).and("tagUser").is(userId),//标签是普通用户结构且普通用户名创建
     					Criteria.where("proDept").is(companyId)
@@ -415,7 +397,7 @@ public class TagService {
 		//根据当前用户所属机构获取公司结构id
 		String companyOrgId = this.getCompanyOrgIdByUserOrgId(dept);
 		Criteria criteria = Criteria.where("tagType").is(Constants.TAG_PERSONAL_TYPE)
-				.and("dept").is(companyOrgId).and("dimensionType").is(Constants.TAG_DIMENSION_TRUE);
+				.and("proDept").is(companyOrgId).and("dimensionType").is(Constants.TAG_DIMENSION_TRUE);
 		if (StringUtils.isNotBlank(path)) {
 			criteria.and("path").regex("^"+path);
 		}
@@ -488,6 +470,10 @@ public class TagService {
 	
 	
 	
+	
+	
+	
+	
 //	public JsonNode[] queryPersonalTagAsTree(String parentId, String userName, String dept) throws TagNotExistException {
 //		List<Tag> tags = new ArrayList<>();
 //		if (StringUtils.isEmpty(parentId)) {
@@ -515,13 +501,6 @@ public class TagService {
 				.with(Sort.by(getDefaultTagOrders()));
 	}
 
-	
-	
-	
-	
-	
-	
-	
 	 public List<Tag> getPersonSubTag(Tag parentTag, String userName) {
 	    	List<Tag> dirs = mongoOperations.find(new Query().addCriteria(Criteria.where("path")
 	    			.regex("^"+parentTag.getPath() + Constants.TAG_PATH_SEPARATOR)
@@ -534,28 +513,10 @@ public class TagService {
 			return dirs;
 	 }
 	 
-
-	
-	
 	private Criteria createPathRegexQuery(String path) {
 		return Criteria.where("path").regex("^"+path);
 	}
 
-	
-
-	
-
-	
-	
-	 
-
-	
-
-	
-
-
-	
-
 	public List<SysTag> listSysTags() {
 		return mongoOperations.findAll(SysTag.class);
 	}