Commit d8b26a8c by zhangkb

修改搜索个人标签接口

parent 8d35161c
...@@ -441,11 +441,17 @@ public class TagService { ...@@ -441,11 +441,17 @@ public class TagService {
.and("dept").is(dept).and("tagUser").is(userName); .and("dept").is(dept).and("tagUser").is(userName);
if (StringUtils.isNotBlank(path)) { if (StringUtils.isNotBlank(path)) {
criteria1 = criteria1.and("path").regex("^"+path); criteria1 = criteria1.and("path").regex("^"+path);
return new Criteria().orOperator(
criteria1,
//查询共享个人标签
Criteria.where("proDept").is(companyOrgId)
.and("path").regex("^"+path).and("isOpen").is(Constants.TAG_OPEN_STATUS));
}else {
return new Criteria().orOperator(
criteria1,
//查询共享个人标签
Criteria.where("proDept").is(companyOrgId).and("isOpen").is(Constants.TAG_OPEN_STATUS));
} }
return new Criteria().orOperator(
criteria1,
//查询共享个人标签
Criteria.where("proDept").is(companyOrgId).and("isOpen").is(Constants.TAG_OPEN_STATUS));
} }
//拼接查询当前系统标签子标签条件 //拼接查询当前系统标签子标签条件
private List<Tag> getSystemSubTag(Tag parentTag) { private List<Tag> getSystemSubTag(Tag parentTag) {
......
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