Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gdtel-gztel-school-center
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
吴学德
gdtel-gztel-school-center
Commits
5cb51389
Commit
5cb51389
authored
May 29, 2021
by
陈浩建
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
分销员字段(未完成)
parent
338b1899
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
5 deletions
+4
-5
service-manager/src/main/java/com/winsun/controller/PartnerController.java
+4
-5
No files found.
service-manager/src/main/java/com/winsun/controller/PartnerController.java
View file @
5cb51389
...
...
@@ -182,7 +182,7 @@ public class PartnerController extends BaseController {
String
schoolRefId
=
(
String
)
refMap
.
get
(
sysUserId
);
Map
<
String
,
Object
>
dataMap
=
new
HashMap
<
String
,
Object
>();
Integer
fxsCount
=
0
;
// 添加合伙人基础数据
for
(
HhrUser
hhrUser
:
hhrUserList
)
{
String
hhrUserId
=
hhrUser
.
getId
();
...
...
@@ -195,6 +195,9 @@ public class PartnerController extends BaseController {
dataMap
.
put
(
"isActive"
,
hhrUser
.
getIsActive
());
dataMap
.
put
(
"idCardImgUrl"
,
hhrUser
.
getIdcardImgUrl
());
dataMap
.
put
(
"studentImgUrl"
,
hhrUser
.
getStudentImgUrl
());
dataMap
.
put
(
"fxs"
,
hhrUser
.
getFxs
());
fxsCount
=
hhrUser
.
getFxs
().
length
()
==
0
?
0
:
hhrUser
.
getFxs
().
split
(
","
).
length
;
dataMap
.
put
(
"fxsCount"
,
fxsCount
);
dataMap
.
put
(
"hasHhr"
,
"0"
);
break
;
}
...
...
@@ -230,21 +233,17 @@ public class PartnerController extends BaseController {
dataMap
.
put
(
"status"
,
sysUser
.
getStatus
());
dataMap
.
put
(
"roleid"
,
sysUser
.
getRoleid
());
dataMap
.
put
(
"roleName"
,
roleMap
.
get
(
sysUser
.
getRoleid
()));
newList
.
add
(
dataMap
);
}
}
// 数据权限控制
newList
=
dataAuthUtil
.
authDeal
(
newList
,
user
);
List
<
Map
<
String
,
Object
>>
dataList
=
new
ArrayList
<
Map
<
String
,
Object
>>();
if
(
newList
.
size
()
<
pageIndex
*
pageSize
)
{
dataList
=
newList
.
subList
((
pageIndex
-
1
)*
pageSize
,
newList
.
size
());
}
else
{
dataList
=
newList
.
subList
((
pageIndex
-
1
)*
pageSize
,
pageIndex
*
pageSize
);
}
page
.
setRecords
(
dataList
);
page
.
setTotal
(
newList
.
size
());
return
ResponseData
.
success
(
page
,
"查询完毕!"
);
...
...
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