修改bug

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/GroupController.java

@@ -150,25 +150,77 @@ public class GroupController extends AbstractBaseController{
 		List<LinkedHashMap<String, Object>> res = new ArrayList<>();
 
 		ReginParams reginParams = getSelectedOrgInfo();
-		String bizOrgCode = reginParams.getPersonIdentity().getBizOrgCode();
 
+		String companyId = reginParams.getCompany().getSequenceNbr().toString();
+
+		// 获取部门及人员信息
+		res = getDeptAndUser(companyId);
+		//	String bizOrgCode = reginParams.getPersonIdentity().getBizOrgCode();
 		// 获取部门及人员信息
-		res = getDeptAndUser(bizOrgCode);
+	//	res = getDeptAndUser(bizOrgCode);
 
 		return CommonResponseUtil.success(res);
 	}
 
+
 	/**
 	 * 根据公司id获取部门及人员信息
 	 * @param companyId
 	 * @return
 	 */
+	private List<LinkedHashMap<String, Object>> getDeptAndUser( String companyId){
+
+		List<LinkedHashMap<String, Object>> res = new ArrayList<>();
+		CompanyModel companyModel = remoteSecurityService.listUserByCompanyId1(getToken(), getProduct(), getAppKey(), companyId);
+		String loginOrgCode = String.valueOf(companyModel.getCompanyOrgCode());
+		List children = (List) companyModel.getChildren();
+
+		for (int i = 0; i < children.size(); i++) {
+			Map<String, Object> map = (LinkedHashMap) children.get(i);
+			LinkedHashMap<String, Object> dept = new LinkedHashMap<>();
+			if("其他".equals((map.get("departmentName").toString()))){
+				dept.put("id", "-1");
+				dept.put("key", "-1");
+				dept.put("value", "-1");
+				dept.put("state", "close");
+				dept.put("label", "其他");
+				dept.put("title", "其他");
+				dept.put("name", "其他");
+				List userModelList = (List) map.get("userModelList");
+				dept.put("children", getUserModelList(userModelList, "-1"));
+			}else{
+				dept.put("id", map.get("sequenceNbr"));
+				dept.put("key", map.get("sequenceNbr"));
+				dept.put("value", map.get("sequenceNbr"));
+				dept.put("state", "open");
+				dept.put("orgCode", loginOrgCode+"-"+map.get("sequenceNbr"));
+				dept.put("label", map.get("departmentName"));
+				dept.put("title", map.get("departmentName"));
+				dept.put("name", map.get("departmentName"));
+				//人员集合
+				List userModelList = (List) map.get("userModelList");
+				dept.put("children", getUserModelList(userModelList, map.get("sequenceNbr")));
+			}
+			dept.put("type", "department");
+			dept.put("writeable", 0);
+			res.add(dept);
+		}
+		return res;
+	}
+
+
+
+	/**
+	 * 根据公司id获取部门及人员信息
+	 * @param companyId
+	 * @return
+	 *//*
 	private List<LinkedHashMap<String, Object>> getDeptAndUser( String bizOrgCode){
 
 		List<LinkedHashMap<String, Object>> res = new ArrayList<>();
-	//	CompanyModel companyModel = remoteSecurityService.listUserByCompanyId1(getToken(), getProduct(), getAppKey(), companyId);
-	//	String loginOrgCode = String.valueOf(companyModel.getCompanyOrgCode());
-	//	List children = (List) companyModel.getChildren();
+	//CompanyModel companyModel = remoteSecurityService.listUserByCompanyId1(getToken(), getProduct(), getAppKey(), companyId);
+//	String loginOrgCode = String.valueOf(companyModel.getCompanyOrgCode());
+	//List children = (List) companyModel.getChildren();
 		ResponseModel<Object> byOrgCode = jcsFeignClient.getByOrgCode(bizOrgCode);
 		Map<String, Object> requestBody = new HashMap<>();
 		requestBody.put("OrgCode",bizOrgCode);
@@ -185,9 +237,7 @@ public class GroupController extends AbstractBaseController{
 					o.put("userModelList",userList);
 				}
 			}
-		}));
-
-
+		}));*//*
 		for (int i = 0; i < orgUsresult.size(); i++) {
 			Map<String, Object> map = (LinkedHashMap) orgUsresult.get(i);
 			if (map.containsKey("userModelList") && map.containsKey("bizOrgName") && !map.get("bizOrgName").equals("")){
@@ -222,7 +272,7 @@ public class GroupController extends AbstractBaseController{
 			}
 		}
 		return res;
-	}
+	}*/
 
 	/**
 	 * 部门人员转换
@@ -237,7 +287,22 @@ public class GroupController extends AbstractBaseController{
 		for(int i = 0; i < userModelList.size(); i++){
 			Map<String, Object> map = (LinkedHashMap) userModelList.get(i);
 			LinkedHashMap<String, Object> user = new LinkedHashMap<>();
-			if (map.get("amosOrgId")!= null && map.get("bizOrgName")!= null ){
+			if (set.add(map.get("userId").toString())) {
+				user.put("id", map.get("sequenceNbr"));
+				if("-1".equals(deptId)){
+					user.put("key", map.get("sequenceNbr") + "-1");
+					user.put("value", map.get("userId").toString() + "@" + "-1");
+				}else{
+					user.put("key", map.get("sequenceNbr") + deptId.toString());
+					user.put("value", map.get("userId").toString() + "@" + deptId.toString());
+				}
+				user.put("label", map.get("realName"));
+				user.put("title", map.get("realName"));
+				user.put("name", map.get("realName"));
+				user.put("userId", map.get("userId"));
+				res.add(user);
+			}
+/*			if (map.get("amosOrgId")!= null && map.get("bizOrgName")!= null ){
 				if (set.add(map.get("amosOrgId").toString())) {
 					user.put("id", map.get("sequenceNbr"));
 					if("-1".equals(deptId)){
@@ -253,7 +318,7 @@ public class GroupController extends AbstractBaseController{
 					user.put("userId", map.get("amosOrgId"));
 					res.add(user);
 				}
-			}
+			}*/
 		}
 
 		return res;