Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Laurel Lee
O2OA
Commits
761e3251
Commit
761e3251
authored
3 years ago
by
o2sword
Committed by
o2null
3 years ago
Browse files
Options
Download
Email Patches
Plain Diff
登录后返回的ws消息改为最新10条
(cherry picked from commit
5094af4d
)
parent
8f963bf7
wrdp-6.4.java8
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/ws/collaboration/ActionCollaboration.java
+2
-2
...ble/communicate/ws/collaboration/ActionCollaboration.java
with
2 additions
and
2 deletions
+2
-2
o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/ws/collaboration/ActionCollaboration.java
+
2
-
2
View file @
761e3251
...
...
@@ -102,8 +102,8 @@ public class ActionCollaboration {
Predicate
p
=
cb
.
equal
(
root
.
get
(
Message_
.
person
),
effectivePerson
.
getDistinguishedName
());
p
=
cb
.
and
(
p
,
cb
.
equal
(
root
.
get
(
Message_
.
consumer
),
MessageConnector
.
CONSUME_WS
));
p
=
cb
.
and
(
p
,
cb
.
equal
(
root
.
get
(
Message_
.
consumed
),
false
));
cq
.
select
(
root
).
where
(
p
).
orderBy
(
cb
.
a
sc
(
root
.
get
(
Message_
.
createTime
)));
os
=
em
.
createQuery
(
cq
).
setMaxResults
(
10
0
).
getResultList
();
cq
.
select
(
root
).
where
(
p
).
orderBy
(
cb
.
de
sc
(
root
.
get
(
Message_
.
createTime
)));
os
=
em
.
createQuery
(
cq
).
setMaxResults
(
10
).
getResultList
();
emc
.
beginTransaction
(
Message
.
class
);
for
(
Message
o
:
os
)
{
o
.
setConsumed
(
true
);
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
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
Menu
Projects
Groups
Snippets
Help