Commit 8d35161c by zhangkb

修改搜索个人标签接口

parent a0760ee7
......@@ -437,12 +437,13 @@ public class TagService {
private Criteria createPersonalTagCriteria(String userName, String dept, String path) throws TagNotExistException{
//根据当前用户机构id获取所属公司机构id
String companyOrgId = this.getCompanyOrgIdByUserOrgId(dept);
Criteria criteria = Criteria.where("tagType").is(Constants.TAG_PERSONAL_TYPE)
Criteria criteria1 = Criteria.where("tagType").is(Constants.TAG_PERSONAL_TYPE)
.and("dept").is(dept).and("tagUser").is(userName);
if (StringUtils.isNotBlank(path)) {
criteria = criteria.and("path").regex("^"+path);
criteria1 = criteria1.and("path").regex("^"+path);
}
return criteria.orOperator(
return new Criteria().orOperator(
criteria1,
//查询共享个人标签
Criteria.where("proDept").is(companyOrgId).and("isOpen").is(Constants.TAG_OPEN_STATUS));
}
......
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