修改查询个人标签接口

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

@@ -409,9 +409,12 @@ public class TagService {
 		for(String companyOrgId : companyOrgIdList) {
 			Criteria criteriaDim = Criteria.where("proDept").is(companyOrgId)
 					.and("dimensionType").is(Constants.TAG_DIMENSION_TRUE);//标签是维度管理员机构的
+			criteriaOr.orOperator(criteriaDim);
+		}
+		for(String companyOrgId : companyOrgIdList) {
 			Criteria criteriaShare = Criteria.where("proDept").is(companyOrgId)
 					.and("isOpen").is(Constants.TAG_OPEN_STATUS);//公司机构id是companyId和是共享状态的
-			criteriaOr.orOperator(criteriaDim,criteriaShare);
+			criteriaOr.orOperator(criteriaShare);
 		}
 		for(String orgId : orgIds) {
 			Criteria criteriaUser = Criteria.where("dept").is(orgId).and("tagUser").is(userId);
@@ -430,9 +433,13 @@ public class TagService {
 		for(String companyOrgId : companyOrgIdList) {
 			Criteria criteriaDim = Criteria.where("proDept").is(companyOrgId)
 					.and("dimensionType").is(Constants.TAG_DIMENSION_TRUE);//标签是维度管理员机构的
+			
+			criteria.orOperator(criteriaDim);
+		}
+		for(String companyOrgId : companyOrgIdList) {
 			Criteria criteriaShare = Criteria.where("proDept").is(companyOrgId)
 					.and("isOpen").is(Constants.TAG_OPEN_STATUS);//公司机构id是companyId和是共享状态的
-			criteria.orOperator(criteriaDim,criteriaShare);
+			criteria.orOperator(criteriaShare);
 		}
 		for(String orgId : orgIds) {
 			Criteria criteriaUser = Criteria.where("dept").is(orgId).and("tagUser").is(userId);