Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
tagManager
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lanmw
tagManager
Commits
f03609fe
Commit
f03609fe
authored
Jun 03, 2020
by
zhangkb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改标签名字含有斜杠问题
parent
b6582aa6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
3 deletions
+9
-3
TagCtrl.java
src/main/java/com/keymobile/tagmanager/api/TagCtrl.java
+3
-1
TagService.java
...ain/java/com/keymobile/tagmanager/service/TagService.java
+6
-2
No files found.
src/main/java/com/keymobile/tagmanager/api/TagCtrl.java
View file @
f03609fe
...
...
@@ -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
,
...
...
src/main/java/com/keymobile/tagmanager/service/TagService.java
View file @
f03609fe
...
...
@@ -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
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment