用户模板导入

blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java

@@ -2688,11 +2688,11 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
                             }
                         }
                          //验证完毕 开始新增
-                        if(userImporterNew.getProjectInfoList().isEmpty()){
+                        if(!userImporterNew.getProjectInfoList().isEmpty()){
                             userImporterNew.getProjectInfoList().removeIf(dto -> dto.getStatus()==1);
                         }
                         String roleIds = "";
-                        if(userImporterNew.getProjectInfoList().isEmpty()){
+                        if(!userImporterNew.getProjectInfoList().isEmpty()){
                             if (userImporterNew.getProjectInfoList() != null) {
                                 roleIds = userImporterNew.getProjectInfoList().stream()
                                         .filter(dto -> dto.getRoleId() != null)
@@ -2730,7 +2730,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
                         /**
                          * 项目分配用户关系表
                          */
-                        if(userImporterNew.getProjectInfoList().isEmpty()){
+                        if(!userImporterNew.getProjectInfoList().isEmpty()){
                             List<ImportPorjectInfoDTO> projectInfoList = userImporterNew.getProjectInfoList();
                             for (ImportPorjectInfoDTO info : projectInfoList) {
                                 SaveUserInfoByProjectDTO dto = new SaveUserInfoByProjectDTO();
@@ -2896,8 +2896,10 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
             e.printStackTrace();
             return R.fail("导入失败：" + e.getMessage());
         }
-
-        return R.success("导入成功,共新增:" + insertUserList.size() + "条有效记录,更新:"+updateUserInfoByProjectList.size()+"条记录,失败:"+logs.size()+"条记录");
+        if(logs.size()>0){
+            return R.fail("导入失败：" + logs.size() + "条记录导入失败");
+        }
+        return R.success("导入成功,共新增:" + insertUserList.size() + "条有效记录,更新:"+updateUserInfoByProjectList.size()+"条记录");
     }
 
     /**