Merge remote-tracking branch 'origin/master'

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

@@ -182,7 +182,7 @@ public class PartnerController extends BaseController {
 			String schoolRefId = (String)refMap.get(sysUserId);
 			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) {
 			for(HhrUser hhrUser : hhrUserList) {
 				String hhrUserId = hhrUser.getId();
 				String hhrUserId = hhrUser.getId();
@@ -195,6 +195,9 @@ public class PartnerController extends BaseController {
 					dataMap.put("isActive",hhrUser.getIsActive());
 					dataMap.put("isActive",hhrUser.getIsActive());
 					dataMap.put("idCardImgUrl",hhrUser.getIdcardImgUrl());
 					dataMap.put("idCardImgUrl",hhrUser.getIdcardImgUrl());
 					dataMap.put("studentImgUrl",hhrUser.getStudentImgUrl());
 					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");
 					dataMap.put("hasHhr","0");
 					break;
 					break;
 				}
 				}
@@ -230,21 +233,17 @@ public class PartnerController extends BaseController {
 				dataMap.put("status", sysUser.getStatus());
 				dataMap.put("status", sysUser.getStatus());
 				dataMap.put("roleid", sysUser.getRoleid());
 				dataMap.put("roleid", sysUser.getRoleid());
 				dataMap.put("roleName", roleMap.get(sysUser.getRoleid()));
 				dataMap.put("roleName", roleMap.get(sysUser.getRoleid()));
-				
 				newList.add(dataMap);
 				newList.add(dataMap);
 			}
 			}
 		}
 		}
-		
 		// 数据权限控制
 		// 数据权限控制
 		newList = dataAuthUtil.authDeal(newList, user);
 		newList = dataAuthUtil.authDeal(newList, user);
-		
 		List<Map<String, Object>> dataList = new ArrayList<Map<String,Object>>();
 		List<Map<String, Object>> dataList = new ArrayList<Map<String,Object>>();
 		if(newList.size() < pageIndex*pageSize) {
 		if(newList.size() < pageIndex*pageSize) {
 			dataList = newList.subList((pageIndex-1)*pageSize, newList.size());
 			dataList = newList.subList((pageIndex-1)*pageSize, newList.size());
 		}else {
 		}else {
 			dataList = newList.subList((pageIndex-1)*pageSize, pageIndex*pageSize);
 			dataList = newList.subList((pageIndex-1)*pageSize, pageIndex*pageSize);
 		}
 		}
-		
 		page.setRecords(dataList);
 		page.setRecords(dataList);
 		page.setTotal(newList.size());
 		page.setTotal(newList.size());
 		return ResponseData.success(page, "查询完毕！");
 		return ResponseData.success(page, "查询完毕！");
@@ -328,6 +327,25 @@ public class PartnerController extends BaseController {
 		return ResponseData.error("新增失败");
 		return ResponseData.error("新增失败");
 	}
 	}
 
 
+
+	@Permission(menuname = "更新分销商信息", value = "pushFxyList", method = RequestMethod.POST)
+	public ResponseData pushFxyList(@RequestParam("id") String id,@RequestParam("fxy") String fxy) {
+		Wrapper<HhrUser> wrapper = new EntityWrapper<>();
+		wrapper.eq("id",id);
+		if("".equals(id)){
+			return ResponseData.error("参数出错");
+		}
+		HhrUser hhrUser = new HhrUser();
+		hhrUser.setId(id);
+		hhrUser.setFxs(fxy);
+		try {
+			hhrUserMapper.updateById(hhrUser);
+		}catch (Exception e){
+			e.printStackTrace();
+			return ResponseData.error("参数出错");
+		}
+		return ResponseData.success("更新完毕！");
+	}
 	@Permission(menuname = "获取学子公司职位下级成员", value = "getXzUserList", method = RequestMethod.POST)
 	@Permission(menuname = "获取学子公司职位下级成员", value = "getXzUserList", method = RequestMethod.POST)
 	public ResponseData<List<HhrUser>> getXzUserList(@RequestParam("position") String position) {
 	public ResponseData<List<HhrUser>> getXzUserList(@RequestParam("position") String position) {
 		ShiroUser user = getShiroUser();
 		ShiroUser user = getShiroUser();