Forráskód Böngészése

up:导人学员判断

yangdamao 3 éve
szülő
commit
0db837840b

+ 6 - 0
zhongzheng-admin/src/main/java/com/zhongzheng/controller/user/UserController.java

@@ -5,6 +5,8 @@ import java.time.format.DateTimeFormatter;
 import java.util.*;
 
 import cn.afterturn.easypoi.excel.entity.ExportParams;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.zhongzheng.common.core.domain.entity.SysUser;
 import com.zhongzheng.common.core.domain.model.LoginUser;
 import com.zhongzheng.common.utils.ServletUtils;
@@ -17,6 +19,7 @@ import com.zhongzheng.modules.user.vo.UserIdCardBatchVo;
 import com.zhongzheng.modules.user.vo.UserStudyRecordVo;
 import com.zhongzheng.modules.user.vo.UserSubscribeExport;
 import com.zhongzheng.modules.user.vo.UserVo;
+import io.netty.util.internal.ObjectUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -155,6 +158,9 @@ public class UserController extends BaseController {
         ExcelUtil<UserImportAddBo> util = new ExcelUtil<UserImportAddBo>(UserImportAddBo.class);
         List<UserImportAddBo> userList = util.importExcel(file.getInputStream());
         Collections.reverse(userList);
+        if (userList.stream().allMatch(item -> ObjectUtils.isNull(item))){
+            throw new IllegalArgumentException("模板格式不正确,请重新下载模板");
+        }
         Map<String, Object> rs = iUserService.importUser(userList,importNo);
         return AjaxResult.success(rs);
     }