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
1bc70a96
Commit
1bc70a96
authored
Jan 10, 2020
by
zhangkb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交修改获取个人标签接口
parent
06bf1140
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
TagService.java
...ain/java/com/keymobile/tagmanager/service/TagService.java
+2
-1
No files found.
src/main/java/com/keymobile/tagmanager/service/TagService.java
View file @
1bc70a96
...
@@ -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
()));
}
}
...
...
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