@@ -487,7 +487,13 @@ public class SysUserController extends BaseController {
if (ObjectUtil.isEmpty(list)) {
throw new RuntimeException("导出数据为空!");
}
- if (list.size() > 10000) {
+ list.forEach(e->{
+ if (e.getIsManager()==null) {
+ e.setIsManager("N");
+ }
+ });
+
+ if(list.size()>10000){
throw new RuntimeException("导出数据量过大(单次导出限量10000条数据),请填写条件分批导出");
try {
@@ -25,7 +25,7 @@ public class UserManagerConverter implements Converter<String> {
@Override
public CellData convertToExcelData(String s, ExcelContentProperty excelContentProperty, GlobalConfiguration globalConfiguration) throws Exception {
// 根据条件修改是否管理人员的值
- if (s!=null) {
+ if ("Y".equals(s)) {
return new CellData("是");
} else {
return new CellData("否");