From f3d8b7f43e0bd8abcf949204e8738daba74d746b Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Mon, 16 Oct 2023 21:18:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/KcEvaluationsStatController.java             | 6 ++++++
 .../modules/kc/statistics/TingKeStatisticsController.java   | 1 +
 2 files changed, 7 insertions(+)

diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/controller/KcEvaluationsStatController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/controller/KcEvaluationsStatController.java
index 3f8abdca..e111b577 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/controller/KcEvaluationsStatController.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/controller/KcEvaluationsStatController.java
@@ -9,6 +9,8 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang3.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
@@ -67,6 +69,10 @@ public class KcEvaluationsStatController extends JeecgController<KcEvaluationsSt
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
+		if(StringUtils.isNotBlank(kcEvaluationsStat.getCol13())){
+			kcEvaluationsStat.setCol13("*"+kcEvaluationsStat.getCol13()+"*");
+		}
+
 		QueryWrapper<KcEvaluationsStat> queryWrapper = QueryGenerator.initQueryWrapper(kcEvaluationsStat, req.getParameterMap());
 		Page<KcEvaluationsStat> page = new Page<KcEvaluationsStat>(pageNo, pageSize);
 		IPage<KcEvaluationsStat> pageList = kcEvaluationsStatService.page(page, queryWrapper);
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/statistics/TingKeStatisticsController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/statistics/TingKeStatisticsController.java
index 84a44751..4728520c 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/statistics/TingKeStatisticsController.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/statistics/TingKeStatisticsController.java
@@ -207,6 +207,7 @@ public class TingKeStatisticsController {
         //查询听课身份
         QueryWrapper<KcExportConfigTpkwcqkjzglx> tksfQw = new QueryWrapper<>();
         tksfQw.in("gh",tjSet);
+        tksfQw.groupBy("tklx");
         List<KcExportConfigTpkwcqkjzglx> tksfList =  kcExportConfigTpkwcqkjzglxService.list(tksfQw);
         Map<String, KcExportConfigTpkwcqkjzglx> tksfMap = Maps.newHashMap();
         tksfList.forEach(x -> {