学习计划

zhongzheng-admin/src/main/java/com/zhongzheng/controller/user/UserSubscribeController.java

@@ -4,6 +4,8 @@ import java.util.List;
 import java.util.Arrays;
 
 import cn.hutool.core.lang.Validator;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.zhongzheng.common.core.domain.model.LoginUser;
 import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.modules.bank.vo.QuestionImport;
@@ -119,7 +121,16 @@ public class UserSubscribeController extends BaseController {
         ExcelUtil<UserSubscribeImport> util = new ExcelUtil<UserSubscribeImport>(UserSubscribeImport.class);
         List<UserSubscribeImport> userSubscribeImportList = util.importExcel(file.getInputStream());
         List<UserSubscribeImport> userSubscribeImport = iUserSubscribeService.importData(userSubscribeImportList);
-        return util.exportExcel(userSubscribeImport, "导入失败原因，请勿将此excel修改后再次上传，请在导入模板修改上传");
+        for (int i = 0; i < userSubscribeImport.size(); i++) {
+            if (StringUtils.isBlank(userSubscribeImport.get(i).getUserName()) && StringUtils.isBlank(userSubscribeImport.get(i).getApplyName()) && StringUtils.isBlank(userSubscribeImport.get(i).getUserName())){
+                userSubscribeImport.remove(i);
+            }
+        }
+        if (!CollectionUtils.isEmpty(userSubscribeImport)) {
+            return util.exportExcel(userSubscribeImport, "导入失败原因，请勿将此excel修改后再次上传，请在导入模板修改上传");
+        }
+        UserSubscribeImport userSubscribeImport1 = null;
+        return AjaxResult.successNoMsg(userSubscribeImport1);
     }
 
     @Log(title = "导入修改预约考试模板", businessType = BusinessType.IMPORT)
@@ -130,7 +141,11 @@ public class UserSubscribeController extends BaseController {
         ExcelUtil<UserSubscribeImport> util = new ExcelUtil<UserSubscribeImport>(UserSubscribeImport.class);
         List<UserSubscribeImport> userSubscribeImportList = util.importExcel(file.getInputStream());
         List<UserSubscribeImport> userSubscribeImport = iUserSubscribeService.importUpdateData(userSubscribeImportList);
-        return util.exportExcel(userSubscribeImport, "导入失败原因，请勿将此excel修改后再次上传，请在导入模板修改上传");
+        if (!CollectionUtils.isEmpty(userSubscribeImport)) {
+            return util.exportExcel(userSubscribeImport, "导入失败原因，请勿将此excel修改后再次上传，请在导入模板修改上传");
+        }
+        UserSubscribeImport userSubscribeImport1 = null;
+        return AjaxResult.successNoMsg(userSubscribeImport1);
     }
 
 }

zhongzheng-common/src/main/java/com/zhongzheng/common/core/domain/AjaxResult.java

@@ -107,6 +107,16 @@ public class AjaxResult<T> extends HashMap<String, Object>
         return AjaxResult.success("操作成功", data);
     }
 
+    /**
+     * 返回成功数据
+     *
+     * @return 成功消息
+     */
+    public static <T> AjaxResult<T> successNoMsg(T data)
+    {
+        return AjaxResult.success("", data);
+    }
+
     /**
      * 返回成功消息
      *