Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
haoban-manage3.0
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
haoban3.0
haoban-manage3.0
Commits
f5bf3ac9
Commit
f5bf3ac9
authored
Sep 19, 2022
by
墨竹
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:空指针
parent
6573c3ad
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
StaffController.java
...com/gic/haoban/manage/web/controller/StaffController.java
+1
-1
ClerkController.java
...com/gic/haoban/manage/web/controller/ClerkController.java
+1
-1
No files found.
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/StaffController.java
View file @
f5bf3ac9
...
@@ -314,7 +314,7 @@ public class StaffController extends WebBaseController {
...
@@ -314,7 +314,7 @@ public class StaffController extends WebBaseController {
}
}
logger
.
info
(
"好办门店数={},wxEnterpriseId={},enterpriseIds={}"
,
storeIds
.
size
(),
wxEnterpriseId
,
enterpriseIds
);
logger
.
info
(
"好办门店数={},wxEnterpriseId={},enterpriseIds={}"
,
storeIds
.
size
(),
wxEnterpriseId
,
enterpriseIds
);
List
<
ClerkDTO
>
clerkDTOList
=
new
ArrayList
<>();
List
<
ClerkDTO
>
clerkDTOList
=
new
ArrayList
<>();
if
(
manageFlag
==
1
)
{
if
(
manageFlag
!=
null
&&
manageFlag
==
1
)
{
clerkDTOList
=
clerkService
.
listClerkEnableHaoban
(
enterpriseIds
,
search
);
clerkDTOList
=
clerkService
.
listClerkEnableHaoban
(
enterpriseIds
,
search
);
}
else
{
}
else
{
clerkDTOList
=
clerkNewService
.
listClerkByEnterpriseIdAndSearchAndClerkType
(
enterpriseIds
,
storeIds
,
search
);
clerkDTOList
=
clerkNewService
.
listClerkByEnterpriseIdAndSearchAndClerkType
(
enterpriseIds
,
storeIds
,
search
);
...
...
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/ClerkController.java
View file @
f5bf3ac9
...
@@ -654,7 +654,7 @@ public class ClerkController extends WebBaseController {
...
@@ -654,7 +654,7 @@ public class ClerkController extends WebBaseController {
}
}
logger
.
info
(
"查询到企微门店数={},{}"
,
storeIds
.
size
(),
storeIds
);
logger
.
info
(
"查询到企微门店数={},{}"
,
storeIds
.
size
(),
storeIds
);
List
<
ClerkDTO
>
clerkList
=
new
ArrayList
<>();
List
<
ClerkDTO
>
clerkList
=
new
ArrayList
<>();
if
(
manageFlag
==
1
)
{
if
(
manageFlag
!=
null
&&
manageFlag
==
1
)
{
clerkList
=
clerkService
.
listClerkEnableHaoban
(
enterpriseIdList
,
keyword
);
clerkList
=
clerkService
.
listClerkEnableHaoban
(
enterpriseIdList
,
keyword
);
}
else
{
}
else
{
clerkList
=
clerkNewService
.
listClerkByEnterpriseIdAndSearchAndClerkType
(
enterpriseIdList
,
storeIds
,
keyword
);
clerkList
=
clerkNewService
.
listClerkByEnterpriseIdAndSearchAndClerkType
(
enterpriseIdList
,
storeIds
,
keyword
);
...
...
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