修改获取个人标签接口

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

@@ -406,19 +406,24 @@ public class TagService {
 			List<String> companyOrgIdList) {
 		Criteria criteria = Criteria.where("tagType").is("1");//获取自定义标签
 		Criteria criteriaOr = new Criteria();
+		List<Criteria> criteriaOrList = new ArrayList<>();
 		for(String companyOrgId : companyOrgIdList) {
 			Criteria criteriaDim = Criteria.where("proDept").is(companyOrgId)
 					.and("dimensionType").is(Constants.TAG_DIMENSION_TRUE);//标签是维度管理员机构的
-			criteriaOr.orOperator(criteriaDim);
+			criteriaOrList.add(criteriaDim);
 		}
 		for(String companyOrgId : companyOrgIdList) {
 			Criteria criteriaShare = Criteria.where("proDept").is(companyOrgId)
 					.and("isOpen").is(Constants.TAG_OPEN_STATUS);//公司机构id是companyId和是共享状态的
-			criteriaOr.orOperator(criteriaShare);
+			criteriaOrList.add(criteriaShare);
 		}
 		for(String orgId : orgIds) {
 			Criteria criteriaUser = Criteria.where("dept").is(orgId).and("tagUser").is(userId);
-			criteriaOr.orOperator(criteriaUser);
+			criteriaOrList.add(criteriaUser);
+		}
+		//拼接or条件
+		for(Criteria c : criteriaOrList) {
+			criteriaOr.orOperator(c);
 		}
 		criteria.andOperator(criteriaOr);
 		return Query.query(criteria)