分销员字段（未完成）

service-manager/src/main/java/com/winsun/controller/PartnerController.java

@@ -52,7 +52,7 @@ public class PartnerController extends BaseController {
 
 	@Autowired
 	public PartnerController(PartnerMapper partnerMapper,SysUserMapper sysUserMapper,
-							 HhrUserMapper hhrUserMapper,SchoolMapper schoolMapper, 
+							 HhrUserMapper hhrUserMapper,SchoolMapper schoolMapper,
 							 HhrSupervisorSchoolMapper hhrSupervisorSchoolMapper) {
 		PartnerController.partnerMapper = partnerMapper;
 		PartnerController.sysUserMapper = sysUserMapper;
@@ -161,28 +161,28 @@ public class PartnerController extends BaseController {
 		wrapperSys.eq(StringUtils.isNotBlank(status), "status", status);
 		wrapperSys.notIn("status", "3,4");
 		List<SysUser> sysUserList = sysUserMapper.selectList(wrapperSys);
-		
+
 		Wrapper<School> wrapperSchool = new EntityWrapper<School>();
 		wrapperSchool.eq(StringUtils.isNotBlank(substName), "sub_name", substName);
 		wrapperSchool.eq(StringUtils.isNotBlank(school), "id", school);
 		List<School> schoolList = schoolMapper.selectList(wrapperSchool);
-		
+
 		Map<String, Object> refMap = MapUtil.listToMap(schoolMapper.getSchoolRef(), "user_id", "school_id");
 		List<Map<String, Object>> newList = new ArrayList<>();
 		Map<String, Object> roleMap = MapUtil.listToMap(partnerMapper.roleList(), "id", "name");
-		
+
 //		List<Map<String, Object>> sysList = new ArrayList<>();
 //		for(SysUser sysUser : sysUserList) {
 //			sysList.add(BeanMap.create(sysUser));
 //		}
-		
+
 		for(int i=0; i<sysUserList.size(); i++) {
 			SysUser sysUser = sysUserList.get(i);
 			String sysUserId = sysUser.getId();
 			String schoolRefId = (String)refMap.get(sysUserId);
-			
-			Map<String, Object> dataMap = new HashMap<String, Object>();
 
+			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, "查询完毕！");
@@ -266,7 +265,7 @@ public class PartnerController extends BaseController {
 		if(accountList.size() > 0) {
 			return ResponseData.error("账号已存在");
 		}
-		
+
 		Wrapper<HhrUser> hhrWrapper = new EntityWrapper<HhrUser>();
 		hhrWrapper.eq("id_card", idCard);
 		List<HhrUser> hhrList = hhrUserMapper.selectList(hhrWrapper);
@@ -279,9 +278,9 @@ public class PartnerController extends BaseController {
 				}
 			}
 		}
-		
-		
-		
+
+
+
 		// String salt = Integer.toString((int)(Math.random()*100000));
 		String salt = MD5Utils.getRandomString(5);
 		password = MD5Utils.md5(password, salt);
@@ -298,7 +297,7 @@ public class PartnerController extends BaseController {
 		sysUser.setCreatetime(new Date());
 		sysUser.setUpdateTime(new Date());
 		int num = sysUserMapper.insert(sysUser);
-		
+
 //		int num = partnerMapper.insertSysUser(account, name, password, salt, sex, phone, roleId, "1",
 //				new Date(), new Date());
 
@@ -307,7 +306,7 @@ public class PartnerController extends BaseController {
 			Map<String, Object> userMap = userList.get(0);
 			String userId = userMap.get("id").toString();
 			HhrUser hhrUser = new HhrUser();
-			
+
 			hhrUser.setId(userId);
 			hhrUser.setIdCard(idCard);
 			hhrUser.setGrade(grade);
@@ -327,7 +326,7 @@ public class PartnerController extends BaseController {
 
 		return ResponseData.error("新增失败");
 	}
-	
+
 	@Permission(menuname = "获取学子公司职位下级成员", value = "getXzUserList", method = RequestMethod.POST)
 	public ResponseData<List<HhrUser>> getXzUserList(@RequestParam("position") String position) {
 		ShiroUser user = getShiroUser();
@@ -340,11 +339,11 @@ public class PartnerController extends BaseController {
 		wrapper.setSqlSelect("id,parent_ids parentIds,position ")
 					  .eq("position", position);
 		List<HhrUser> list = hhrUserMapper.selectList(wrapper);
-		
+
 		Wrapper<SysUser> wrapperSys = new EntityWrapper<SysUser>();
 		wrapperSys.setSqlSelect("id,name ");
 		List<SysUser> sysList = sysUserMapper.selectList(wrapperSys);
-		
+
 		for(HhrUser hhrUser : list) {
 			for(SysUser sysUser :sysList) {
 				if(hhrUser.getId().equals(sysUser.getId())) {
@@ -356,16 +355,16 @@ public class PartnerController extends BaseController {
 
 		return ResponseData.success(list, "查询完毕！");
 	}
-	
+
 	@Permission(menuname = "获取角色清单", value = "roleList", method = RequestMethod.POST)
 	public ResponseData<List<Map<String, Object>>> roleList() {
 		List<Map<String, Object>> list = partnerMapper.roleList();
 		ShiroUser user = getShiroUser();
 		List<Map<String, Object>> resultList = dataAuthUtil.roleAuth(list, user);
-		
+
 		return ResponseData.success(resultList, "查询完毕！");
 	}
-	
+
 	@Permission(menuname = "导出合伙人信息", value = "exportUserList", method = RequestMethod.POST)
 	public void exportUserList(@RequestParam("school") String school,
 			@RequestParam("name") String name, @RequestParam("substName") String substName,
@@ -385,7 +384,7 @@ public class PartnerController extends BaseController {
 		}
 
 		List<Map<String, Object>> hhrUserList = hhrUserMapper.selectMaps(wrapperHhr);
-		
+
 		Wrapper<SysUser> wrapperSys = new EntityWrapper<SysUser>();
 		wrapperSys.setSqlSelect(" id,name,account,roleid,phone,(case status when 1 then '启用' when 2 then '冻结' else status end) status,"
 				+ " (case sex when '1' then '男' when '2' then '女' else sex end) sex  ");
@@ -395,28 +394,28 @@ public class PartnerController extends BaseController {
 		wrapperSys.eq(StringUtils.isNotBlank(status), "status", status);
 		wrapperSys.notIn("status");
 		List<SysUser> sysUserList = sysUserMapper.selectList(wrapperSys);
-		
+
 		Wrapper<School> wrapperSchool = new EntityWrapper<School>();
 		wrapperSchool.eq(StringUtils.isNotBlank(substName), "sub_name", substName);
 		wrapperSchool.eq(StringUtils.isNotBlank(school), "id", school);
 		List<School> schoolList = schoolMapper.selectList(wrapperSchool);
-		
+
 		Map<String, Object> refMap = MapUtil.listToMap(schoolMapper.getSchoolRef(), "user_id", "school_id");
 		List<Map<String, Object>> newList = new ArrayList<>();
 		Map<String, Object> roleMap = MapUtil.listToMap(partnerMapper.roleList(), "id", "name");
-		
+
 //		List<Map<String, Object>> sysList = new ArrayList<>();
 //		for(SysUser sysUser : sysUserList) {
 //			sysList.add(BeanMap.create(sysUser));
 //		}
-		
+
 		for(int i=0; i<sysUserList.size(); i++) {
 			SysUser sysUser = sysUserList.get(i);
 			String sysUserId = sysUser.getId();
 			String schoolRefId = (String)refMap.get(sysUserId);
-			
+
 			Map<String, Object> dataMap = new HashMap<String, Object>();
-			
+
 			for(Map<String, Object> hhrMap : hhrUserList) {
 				String hhrUserId = hhrMap.get("id").toString();
 				if(sysUserId.equals(hhrUserId)) {
@@ -432,7 +431,7 @@ public class PartnerController extends BaseController {
 					break;
 				}
 			}
-			
+
 			for(School schoolEntity : schoolList) {
 				String schoolId = Integer.toString(schoolEntity.getId());
 				if(null != schoolRefId && schoolRefId.equals(schoolId)) {
@@ -443,7 +442,7 @@ public class PartnerController extends BaseController {
 					break;
 				}
 			}
-			
+
 			// 需要两个数据表都匹配到，才添加
 			if(null != dataMap.get("id") && null != dataMap.get("hasHhr")) {
 				dataMap.put("name", sysUser.getName());
@@ -453,11 +452,11 @@ 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);
 
@@ -478,18 +477,18 @@ public class PartnerController extends BaseController {
             IOUtils.closeQuite(workbook, os);
         }
     }
-	
+
 	@Permission(menuname = "删除用户", value = "deleteUser", method = RequestMethod.POST)
 	public ResponseData<Object> deleteUser(@Param("id") String id) {
 		SysUser sysUser = new SysUser();
 		sysUser.setId(id);
 		sysUser.setStatus("3");
-		
+
 		int num = sysUserMapper.updateById(sysUser);
 		if(num > 0) {
 			return ResponseData.success("删除成功");
 		}
-		
+
 		return ResponseData.success("删除失败");
 	}
 }