MERGE

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;
@@ -153,8 +156,17 @@ public class UserController extends BaseController {
     public AjaxResult<Map<String,Object>> importData(MultipartFile file, String importNo) throws Exception
     {
         ExcelUtil<UserImportAddBo> util = new ExcelUtil<UserImportAddBo>(UserImportAddBo.class);
-        List<UserImportAddBo> userList = util.importExcel(file.getInputStream());
+        List<UserImportAddBo> userList = null;
+        try{
+            userList = util.importExcel(file.getInputStream());
+        }catch (Exception e){
+            e.printStackTrace();
+            throw new IllegalArgumentException("模板格式不正确,请重新下载模板");
+        }
         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);
     }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassStudentExportVo.java

@@ -133,13 +133,13 @@ public class ClassStudentExportVo implements Serializable {
 		vo.setUserStatusStr(ObjectUtil.isNotNull(studentVo.getUserStatus()) && studentVo.getUserStatus() == 1?"变更":"未变更");
 		vo.setUserBindWxStr(ObjectUtil.isNotNull(studentVo.getUserBindWx()) && studentVo.getUserBindWx() == 1?"是":"否");
 		vo.setUserFollowWxStr(ObjectUtil.isNotNull(studentVo.getUserFollowWx()) && studentVo.getUserFollowWx() == 1?"是":"否");
-		if (ObjectUtil.isNotNull(studentVo.getStuAllNum()) && ObjectUtil.isNotNull(studentVo.getSecAllNum())){
+		if (ObjectUtil.isNotNull(studentVo.getStuAllNum()) && ObjectUtil.isNotNull(studentVo.getSecAllNum()) && studentVo.getSecAllNum() != 0){
 			BigDecimal bigDecimal = new BigDecimal(studentVo.getStuAllNum());
 			BigDecimal bigDecimal1 = new BigDecimal(studentVo.getSecAllNum());
 			BigDecimal multiply = bigDecimal.divide(bigDecimal1, 0, BigDecimal.ROUND_CEILING).multiply(new BigDecimal("100.00"));
 			vo.setStuAllNumStr(studentVo.getStuAllNum()+"/"+studentVo.getSecAllNum()+" "+multiply+"%");
 		}
-		if (ObjectUtil.isNotNull(studentVo.getRecordNum()) && ObjectUtil.isNotNull(studentVo.getExamNum())){
+		if (ObjectUtil.isNotNull(studentVo.getRecordNum()) && ObjectUtil.isNotNull(studentVo.getExamNum()) && studentVo.getExamNum() != 0){
 			BigDecimal bigDecimal = new BigDecimal(studentVo.getRecordNum());
 			BigDecimal bigDecimal1 = new BigDecimal(studentVo.getExamNum());
 			BigDecimal multiply = bigDecimal.divide(bigDecimal1, 0, BigDecimal.ROUND_CEILING).multiply(new BigDecimal("100.00"));