Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi
| | |
| | | return AjaxResult.error("白名单手机号存在重复!"); |
| | | } |
| | | Map<String, Long> codeMap = xpWhitelistService.list().stream() |
| | | .collect(Collectors.toMap(XpWhitelist::getAccount, XpWhitelist::getId)); |
| | | .collect(Collectors.toMap( |
| | | XpWhitelist::getAccount, |
| | | XpWhitelist::getId, |
| | | (existing, replacement) -> replacement // 如果冲突,用新的覆盖 |
| | | )); |
| | | JSONObject result = new JSONObject(); |
| | | List<XpWhitelist> addList = new ArrayList<>(); |
| | | for (WhitelistImportExcel whitelistImportExcel : whitelistImportExcels) { |