修改获取个人标签树接口

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

@@ -404,19 +404,20 @@ public class TagService {
 	//拼接查找个人标签条件
 	private Query createNewPersonalTagQuery(String userId,List<String> orgIds,
 			List<String> companyOrgIdList) {
-		Criteria criteria = new Criteria();
+		Criteria criteria = Criteria.where("tagType").is("1");//获取自定义标签
+		Criteria criteriaOr = new Criteria();
 		for(String companyOrgId : companyOrgIdList) {
 			Criteria criteriaDim = Criteria.where("proDept").is(companyOrgId)
 					.and("dimensionType").is(Constants.TAG_DIMENSION_TRUE);//标签是维度管理员机构的
 			Criteria criteriaShare = Criteria.where("proDept").is(companyOrgId)
 					.and("isOpen").is(Constants.TAG_OPEN_STATUS);//公司机构id是companyId和是共享状态的
-			criteria.orOperator(criteriaDim,criteriaShare);
+			criteriaOr.orOperator(criteriaDim,criteriaShare);
 		}
 		for(String orgId : orgIds) {
 			Criteria criteriaUser = Criteria.where("dept").is(orgId).and("tagUser").is(userId);
-			criteria.orOperator(criteriaUser);
+			criteriaOr.orOperator(criteriaUser);
 		}
-		criteria.and("tagType").is("1");//获取自定义标签
+		criteria.andOperator(criteriaOr);
 		return Query.query(criteria)
 				.with(Sort.by(getDefaultTagOrders()));
 	}
@@ -489,24 +490,25 @@ public class TagService {
 	//拼接个人标签查询条件
 	private Criteria createPersonalTagCriteria(String userName, List<String> orgIds, 
 			List<String> companyOrgIdList, String path) throws TagNotExistException{
+		Criteria criteria = Criteria.where("tagType").is(Constants.TAG_PERSONAL_TYPE);
 		Criteria criteriaOr = new Criteria();
 		for(String orgId : orgIds) {
-			Criteria criteria = Criteria.where("tagType").is(Constants.TAG_PERSONAL_TYPE)
-					.and("dept").is(orgId).and("tagUser").is(userName);
+			Criteria criteriaUser = Criteria.where("dept").is(orgId).and("tagUser").is(userName);
 			if (StringUtils.isNotBlank(path)) {
-				criteria.and("path").regex("^"+path);
+				criteriaUser.and("path").regex("^"+path);
 			}
-			criteriaOr.orOperator(criteria);
+			criteriaOr.orOperator(criteriaUser);
 		}
 		for(String companyOrgId : companyOrgIdList) {
-			Criteria criteria = Criteria.where("proDept").is(companyOrgId)
+			Criteria criteriaUser = Criteria.where("proDept").is(companyOrgId)
 					.and("isOpen").is(Constants.TAG_OPEN_STATUS);
 			if (StringUtils.isNotBlank(path)) {
-				criteria.and("path").regex("^"+path);
+				criteriaUser.and("path").regex("^"+path);
 			}
-			criteriaOr.orOperator(criteria);
+			criteriaOr.orOperator(criteriaUser);
 		}
-		return criteriaOr;
+		criteria.andOperator(criteriaOr);
+		return criteria;
 	}
 	//拼接查询当前系统标签子标签条件
 	private List<Tag> getSystemSubTag(Tag parentTag) {