From a5ce8eb9823603aab3e8ce19b35ce78a0a4d0655 Mon Sep 17 00:00:00 2001 From: bai <1643359946@qq.com> Date: Thu, 24 Aug 2023 15:41:08 +0800 Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B48=E6=9C=8824=E6=97=A5=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../KcExportConfigTpkwcqkjzglxController.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/controller/KcExportConfigTpkwcqkjzglxController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/controller/KcExportConfigTpkwcqkjzglxController.java index 7827b68c..726e2958 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/controller/KcExportConfigTpkwcqkjzglxController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/controller/KcExportConfigTpkwcqkjzglxController.java @@ -7,6 +7,7 @@ import com.google.common.collect.Maps; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.compress.utils.Lists; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -83,13 +84,16 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper("a",kcExportConfigTpkwcqkjzglx, req.getParameterMap()); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(kcExportConfigTpkwcqkjzglx, req.getParameterMap()); // queryWrapper.eq(StringUtils.isNotBlank(kcExportConfigTpkwcqkjzglx.getDwmc()),"b.dwmc",kcExportConfigTpkwcqkjzglx.getDwmc()); Page page = new Page<>(pageNo, pageSize); IPage pageList = kcExportConfigTpkwcqkjzglxService.page(page, queryWrapper); //根据当前学期学年，硬合并出来一个数据 QueryWrapper tjQw = new QueryWrapper<>(); KcXqxnHistory kcXqxnHistory = changeTingKeTongJi.getXqConfig(kcExportConfigTpkwcqkjzglx.getXqxn()); + if(kcXqxnHistory == null){ + return Result.OK(new Page<>()); + } tjQw.eq("xnxq",kcXqxnHistory.getTitle()); List tjList = kcTkcstjService.list(tjQw); Map tjMap = Maps.newHashMap(); @@ -233,6 +237,10 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController tjQw = new QueryWrapper<>(); KcXqxnHistory kcXqxnHistory = changeTingKeTongJi.getXqConfig(object.getXqxn()); + if(kcXqxnHistory == null){ + exportList = Lists.newArrayList(); + } + tjQw.eq("xnxq",kcXqxnHistory.getTitle()); List tjList = kcTkcstjService.list(tjQw); Map tjMap = Maps.newHashMap();