Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
midjourney-proxy
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
徐少华
midjourney-proxy
Commits
71c4dd6a
Commit
71c4dd6a
authored
Feb 17, 2020
by
阮思源
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'zyj-fixbug-userserch' into 'master'
fixbug See merge request rays/pcloud-book!426
parents
b0d4e19d
3282f023
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
0 deletions
+6
-0
TaskCompletedBizImpl.java
...cloud/book/timecontrol/biz/impl/TaskCompletedBizImpl.java
+6
-0
No files found.
pcloud-service-book/src/main/java/com/pcloud/book/timecontrol/biz/impl/TaskCompletedBizImpl.java
View file @
71c4dd6a
...
@@ -84,6 +84,9 @@ public class TaskCompletedBizImpl implements TaskCompletedBiz {
...
@@ -84,6 +84,9 @@ public class TaskCompletedBizImpl implements TaskCompletedBiz {
List
<
String
>
wxIds
=
new
ArrayList
<>();
List
<
String
>
wxIds
=
new
ArrayList
<>();
if
(
StringUtil
.
isNotBlank
(
search
)){
if
(
StringUtil
.
isNotBlank
(
search
)){
wxIds
=
wechatGroupConsr
.
getByUserQuery
(
search
);
wxIds
=
wechatGroupConsr
.
getByUserQuery
(
search
);
if
(
ListUtils
.
isEmpty
(
wxIds
)){
return
new
PageBeanNew
<>(
currentPage
,
numPerPage
,
0
,
list
);
}
}
}
Integer
count
=
taskMapper
.
getSubscribeCount
(
search
,
taskId
,
subscribeType
,
wxIds
);
Integer
count
=
taskMapper
.
getSubscribeCount
(
search
,
taskId
,
subscribeType
,
wxIds
);
if
(
count
<=
0
)
{
if
(
count
<=
0
)
{
...
@@ -178,6 +181,9 @@ public class TaskCompletedBizImpl implements TaskCompletedBiz {
...
@@ -178,6 +181,9 @@ public class TaskCompletedBizImpl implements TaskCompletedBiz {
List
<
String
>
wxIds
=
new
ArrayList
<>();
List
<
String
>
wxIds
=
new
ArrayList
<>();
if
(
StringUtil
.
isNotBlank
(
search
))
{
if
(
StringUtil
.
isNotBlank
(
search
))
{
wxIds
=
wechatGroupConsr
.
getByUserQuery
(
search
);
wxIds
=
wechatGroupConsr
.
getByUserQuery
(
search
);
if
(
ListUtils
.
isEmpty
(
wxIds
)){
return
new
PageBeanNew
<>(
currentPage
,
numPerPage
,
0
,
list
);
}
}
}
Integer
count
=
timeControlTaskSendMapper
.
getTaskItemSendUserCount
(
wxIds
,
taskItemId
,
robotWxId
);
Integer
count
=
timeControlTaskSendMapper
.
getTaskItemSendUserCount
(
wxIds
,
taskItemId
,
robotWxId
);
if
(
count
<=
0
)
{
if
(
count
<=
0
)
{
...
...
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