Commit 5cb51389 by 陈浩建

分销员字段(未完成)

parent 338b1899
......@@ -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, "查询完毕!");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment