Commit 1bc70a96 by zhangkb

提交修改获取个人标签接口

parent 06bf1140
...@@ -404,7 +404,7 @@ public class TagService { ...@@ -404,7 +404,7 @@ public class TagService {
//拼接查找个人标签条件 //拼接查找个人标签条件
private Query createNewPersonalTagQuery(String userId,List<String> orgIds, private Query createNewPersonalTagQuery(String userId,List<String> orgIds,
List<String> companyOrgIdList) { List<String> companyOrgIdList) {
Criteria criteria = Criteria.where("tagType").is("1");//获取自定义标签 Criteria criteria = new Criteria();
for(String companyOrgId : companyOrgIdList) { for(String companyOrgId : companyOrgIdList) {
Criteria criteriaDim = Criteria.where("proDept").is(companyOrgId) Criteria criteriaDim = Criteria.where("proDept").is(companyOrgId)
.and("dimensionType").is(Constants.TAG_DIMENSION_TRUE);//标签是维度管理员机构的 .and("dimensionType").is(Constants.TAG_DIMENSION_TRUE);//标签是维度管理员机构的
...@@ -416,6 +416,7 @@ public class TagService { ...@@ -416,6 +416,7 @@ public class TagService {
Criteria criteriaUser = Criteria.where("dept").is(orgId).and("tagUser").is(userId); Criteria criteriaUser = Criteria.where("dept").is(orgId).and("tagUser").is(userId);
criteria.orOperator(criteriaUser); criteria.orOperator(criteriaUser);
} }
criteria.and("tagType").is("1");//获取自定义标签
return Query.query(criteria) return Query.query(criteria)
.with(Sort.by(getDefaultTagOrders())); .with(Sort.by(getDefaultTagOrders()));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment