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<KcExpo
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-		QueryWrapper<KcExportConfigTpkwcqkjzglx> queryWrapper = QueryGenerator.initQueryWrapper("a",kcExportConfigTpkwcqkjzglx, req.getParameterMap());
+		QueryWrapper<KcExportConfigTpkwcqkjzglx> queryWrapper = QueryGenerator.initQueryWrapper(kcExportConfigTpkwcqkjzglx, req.getParameterMap());
 //		queryWrapper.eq(StringUtils.isNotBlank(kcExportConfigTpkwcqkjzglx.getDwmc()),"b.dwmc",kcExportConfigTpkwcqkjzglx.getDwmc());
 		Page<KcExportConfigTpkwcqkjzglx> page = new Page<>(pageNo, pageSize);
 		IPage<KcExportConfigTpkwcqkjzglx> pageList = kcExportConfigTpkwcqkjzglxService.page(page, queryWrapper);
 		//根据当前学期学年，硬合并出来一个数据
 		QueryWrapper<KcTkcstj> tjQw = new QueryWrapper<>();
 		KcXqxnHistory kcXqxnHistory = changeTingKeTongJi.getXqConfig(kcExportConfigTpkwcqkjzglx.getXqxn());
+		if(kcXqxnHistory == null){
+			return Result.OK(new Page<>());
+		}
 		tjQw.eq("xnxq",kcXqxnHistory.getTitle());
 		List<KcTkcstj> tjList = kcTkcstjService.list(tjQw);
 		Map<String,KcTkcstj> tjMap = Maps.newHashMap();
@@ -233,6 +237,10 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController<KcExpo
 		//根据当前学期学年，硬合并出来一个数据
 		QueryWrapper<KcTkcstj> tjQw = new QueryWrapper<>();
 		KcXqxnHistory kcXqxnHistory = changeTingKeTongJi.getXqConfig(object.getXqxn());
+		if(kcXqxnHistory == null){
+			exportList = Lists.newArrayList();
+		}
+
 		tjQw.eq("xnxq",kcXqxnHistory.getTitle());
 		List<KcTkcstj> tjList = kcTkcstjService.list(tjQw);
 		Map<String,KcTkcstj> tjMap = Maps.newHashMap();