Commit f03609fe by zhangkb

修改标签名字含有斜杠问题

parent b6582aa6
......@@ -202,7 +202,9 @@ public class TagCtrl {
List<Long> deptList = GrantedAuthHelper.getUserGrantedOrgs();
if(deptList!=null) {
for(Long dept : deptList) {
orgIds.add(String.valueOf(dept));
if(!orgIds.contains(String.valueOf(dept))) {
orgIds.add(String.valueOf(dept));
}
}
}
return tagService.searchPersonalTagByPage(userName, orgIds, keyword, path,
......
......@@ -702,13 +702,17 @@ public class TagService {
//拼接个人标签查询条件
private Criteria createPersonalTagCriteria(String userName, List<String> orgIds,
List<String> companyOrgIdList, String path,String keyword) throws TagNotExistException{
if(path.contains("\\")) {
String[] paths = path.split("\\\\");
path = paths[0]+"\\\\"+paths[1];
}
Criteria criteria = Criteria.where("tagType").is(Constants.TAG_PERSONAL_TYPE);
Criteria criteriaOr = new Criteria();
List<Criteria> criteriaOrList = new ArrayList<>();
for(String orgId : orgIds) {
Criteria criteriaUser = Criteria.where("dept").is(orgId).and("tagUser").is(userName);
if (StringUtils.isNotBlank(path)) {
criteriaUser.and("path").regex("^"+path);
criteriaUser.and("path").regex("^"+path+",");
}
criteriaOrList.add(criteriaUser);
}
......@@ -716,7 +720,7 @@ public class TagService {
Criteria criteriaUser = Criteria.where("proDept").is(companyOrgId)
.and("isOpen").is(Constants.TAG_OPEN_STATUS);
if (StringUtils.isNotBlank(path)) {
criteriaUser.and("path").regex("^"+path);
criteriaUser.and("path").regex("^"+path+",");
}
criteriaOrList.add(criteriaUser);
}
......
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