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
61172796
Commit
61172796
authored
Mar 05, 2020
by
qwmqiuwenmin
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'developer' of
http://115.159.76.241/haoban3.0/haoban-manage3.0.git
into developer
parents
1e445513
dd4dd698
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
0 deletions
+2
-0
ClerkController.java
...com/gic/haoban/manage/web/controller/ClerkController.java
+2
-0
No files found.
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/ClerkController.java
View file @
61172796
...
...
@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
import
cn.hutool.core.collection.CollectionUtil
;
import
com.alibaba.csp.sentinel.util.StringUtil
;
import
com.alibaba.fastjson.JSONObject
;
import
com.gic.clerk.api.dto.ClerkDTO
;
import
com.gic.clerk.api.service.ClerkService
;
import
com.gic.commons.util.EntityUtil
;
...
...
@@ -71,6 +72,7 @@ public class ClerkController extends WebBaseController{
// 调陶接口获取详情数据
if
(
CollectionUtil
.
isNotEmpty
(
list
)){
List
<
String
>
clerkCodes
=
list
.
stream
().
filter
(
s
->
s
.
getClerkCode
()!=
null
).
map
(
s
->
s
.
getClerkCode
()).
collect
(
Collectors
.
toList
());
logger
.
info
(
"clerkCodes =============>为{}"
,
JSONObject
.
toJSONString
(
clerkCodes
));
if
(
CollectionUtil
.
isNotEmpty
(
clerkCodes
)){
List
<
ClerkDTO
>
clerkList
=
clerkService
.
listClerk
(
storeId
,
clerkCodes
,
true
);
result
=
EntityUtil
.
changeEntityListByJSON
(
ClerkVo
.
class
,
clerkList
);
...
...
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