修改巡检计划执行人树同一节点人员重复

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

 package com.yeejoin.amos.patrol.business.controller;
 
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
+import opennlp.tools.util.HashList;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -206,25 +204,27 @@ public class GroupController extends AbstractBaseController{
 	private List getUserModelList(List userModelList, Object deptId){
 
 		List<LinkedHashMap<String, Object>> res = new ArrayList<>();
+		// 同一个节点下人员不重复
+		Set<String> set = new HashSet<>();
 		for(int i = 0; i < userModelList.size(); i++){
 			Map<String, Object> map = (LinkedHashMap) userModelList.get(i);
 			LinkedHashMap<String, Object> user = new LinkedHashMap<>();
 
-			user.put("id", map.get("sequenceNbr"));
-			if("-1".equals(deptId)){
-//				user.put("id", map.get("userId").toString() + "@" + "-1");
-				user.put("key", map.get("sequenceNbr") + "-1");
-				user.put("value", map.get("userId").toString() + "@" + "-1");
-			}else{
-//				user.put("id", map.get("userId").toString() + "@" + deptId.toString());
-				user.put("key", map.get("sequenceNbr") + deptId.toString());
-				user.put("value", map.get("userId").toString() + "@" + deptId.toString());
+			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);
 			}
-			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);
 		}
 
 		return res;