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
b2e19277
Commit
b2e19277
authored
Apr 19, 2021
by
fudahua
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
素材列表
parent
b1019e5f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletions
+3
-1
LoginController.java
...com/gic/haoban/manage/web/controller/LoginController.java
+2
-0
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/LoginController.java
View file @
b2e19277
...
...
@@ -202,12 +202,14 @@ public class LoginController extends WebBaseController{
JSONObject
jsonObject
=
JSONObject
.
parseObject
(
o
);
String
gicEnterpriseId
=
jsonObject
.
getString
(
"enterpriseId"
);
String
loginPhoneNumber
=
jsonObject
.
getString
(
"phoneNumber"
);
// String wxEnterpriseId = jsonObject.getString("wxEnterpriseId");
List
<
WxEnterpriseDTO
>
enterpriseDTOList
=
wxEnterpriseRelatedApiService
.
listWxEnterpriseByEid
(
gicEnterpriseId
);
if
(
CollectionUtils
.
isEmpty
(
enterpriseDTOList
))
{
logger
.
info
(
"登录失败,不存在对应企业:{}"
,
o
);
ModelAndView
model
=
new
ModelAndView
(
new
RedirectView
(
"/haoban-3/#/gic-error"
,
false
,
false
));
return
model
;
}
//TODO 销售线索 多个选择
WxEnterpriseDTO
detailDTO
=
enterpriseDTOList
.
get
(
0
);
...
...
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/ClerkController.java
View file @
b2e19277
...
...
@@ -452,7 +452,7 @@ public class ClerkController extends WebBaseController{
return
!
over
;
}).
map
(
s
->
s
.
getEnterpriseId
()).
collect
(
Collectors
.
toList
());
List
<
String
>
storeIds
=
wxEnterpriseRelatedApiService
.
listStoreIdByWxEnterpriseId
(
wxEnterpriseId
);
List
<
ClerkDTO
>
clerkList
=
clerkNewService
.
listClerkByEnterpriseIdAndSearch
(
enterpriseIdList
,
storeIds
,
keyword
);
List
<
ClerkDTO
>
clerkList
=
clerkNewService
.
listClerkByEnterpriseIdAndSearch
(
enterpriseIdList
,
keyword
);
List
<
ClerkStoreVO
>
clerkStoreList
=
new
ArrayList
<>();
if
(
CollectionUtil
.
isEmpty
(
clerkList
)){
return
resultResponse
(
HaoBanErrCode
.
ERR_1
,
clerkStoreList
);
...
...
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