fix: 导入

lxk-admin/src/main/java/com/zbkj/admin/controller/excel/ReturnCommissionPlatformInformationExcelController.java

@@ -56,9 +56,9 @@ public class ReturnCommissionPlatformInformationExcelController {
 
     @LogControllerAnnotation(intoDB = true, methodType = MethodType.UPDATE, description = "参与用户编号导入")
     @ApiOperation(value = "参与用户编号导入")
-    @RequestMapping(value = {"/import/join/user/{platformId}","/import/join/user"}, method = RequestMethod.POST)
-    public CommonResult<ExcelImportResponse> importData(@PathVariable(value = "platformId", required = false) Integer platformId, MultipartFile file) throws Exception {
-        return CommonResult.success(joinUserService.importExcel(platformId, file));
+    @RequestMapping(value = "/import/join/user", method = RequestMethod.POST)
+    public CommonResult<ExcelImportResponse> importData(MultipartFile file) throws Exception {
+        return CommonResult.success(joinUserService.importExcel(null, file));
     }
 
     @ApiOperation(value = "导出参与用户编号错误文件")

lxk-service/src/main/java/com/zbkj/service/service/impl/ReturnCommissionPlatformInformationJoinUserServiceImpl.java

@@ -308,6 +308,7 @@ public class ReturnCommissionPlatformInformationJoinUserServiceImpl extends Serv
             lqw.in(ReturnCommissionPlatformInformationJoinUser::getUid, userMap.keySet());
             List<ReturnCommissionPlatformInformationJoinUser> joinUserList = list(lqw);
             Map<String, List<ReturnCommissionPlatformInformationJoinUser>> joinUsers = joinUserList.stream().
+                    filter(vo -> StrUtil.isNotBlank(vo.getDriverKey())).
                     //map(v -> {User user = userMap.get(v.getUid());v.setDriverKey(Convert.toStr(user.getUserSn()));return v;}).
                             collect(Collectors.groupingBy(ReturnCommissionPlatformInformationJoinUser::getDriverKey));
             Set<String> idCard = new HashSet<>();