修改角色添加重复问题

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/RegUnitInfoServiceImpl.java

@@ -409,13 +409,15 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
 				String[] appCodes = appCode.split(",");
 				Collections.addAll(appCodesSet, appCodes);
 				roleNameSet.add(unitType.getName());
-				userRoleList = allRoleList.stream().filter(r -> r.getRoleName().equals(unitType.getName()))
-						.collect(Collectors.toList());
-				for (RoleModel roleModel : allRoleList.stream()
-						.filter(r -> r.getRoleName().equals(unitType.getExtend())).collect(Collectors.toList())) {
+				userRoleList = allRoleList.stream().filter(r -> r.getRoleName().equals(unitType.getName())).collect(Collectors.toList());
+				for (RoleModel roleModel : allRoleList.stream().filter(r -> r.getRoleName().equals(unitType.getExtend())).collect(Collectors.toList())) {
 					userRoleList.add(roleModel);
 				}
-				userRoleList.forEach(r -> roleIds.add(r.getSequenceNbr()));
+				userRoleList.forEach(r -> {
+					if(!roleIds.contains(r.getSequenceNbr())) {
+						roleIds.add(r.getSequenceNbr());
+					}
+				});
 				roleSeqMap.put(companyInfo.getSequenceNbr(), roleIds);
 				orgRoles.put(companyInfo.getSequenceNbr(), userRoleList);
 			}