From 302a3db87c1cba30fc40ee30bd61716f1d928edf Mon Sep 17 00:00:00 2001 From: Gitea Date: Wed, 31 Jul 2024 01:05:50 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=AF=94=E8=B5=9B=E4=B8=93=E5=AE=B6?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=8A=B6=E6=80=81=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/demo/expert/controller/ExpertController.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/controller/ExpertController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/controller/ExpertController.java index 6ea35bca..28cbacb6 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/controller/ExpertController.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/controller/ExpertController.java @@ -259,7 +259,9 @@ public class ExpertController extends JeecgController { } sbCompid.append(item.getCompid()); sbCompName.append(item.getCompName()); - sbStat.append(item.getStat()); + if("".equals(sbStat)){ + sbStat.append(item.getStat()); + } } // 将 StringBuilder 转换为 String Compid = sbCompid.toString(); @@ -447,7 +449,7 @@ public class ExpertController extends JeecgController { } return result; } - + /** * 导出excel模板 From c2b1a1235349c360aaa6f71710b00d35b6e60a49 Mon Sep 17 00:00:00 2001 From: Gitea Date: Wed, 31 Jul 2024 01:11:25 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=AF=94=E8=B5=9B=E4=B8=93=E5=AE=B6?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=8A=B6=E6=80=81=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/demo/expert/controller/ExpertController.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/controller/ExpertController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/controller/ExpertController.java index 28cbacb6..e375d25e 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/controller/ExpertController.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/controller/ExpertController.java @@ -259,9 +259,7 @@ public class ExpertController extends JeecgController { } sbCompid.append(item.getCompid()); sbCompName.append(item.getCompName()); - if("".equals(sbStat)){ - sbStat.append(item.getStat()); - } + sbStat.append(item.getStat()); } // 将 StringBuilder 转换为 String Compid = sbCompid.toString(); From e63c2ddca079d4da77bbb347ea607fc8464b033e Mon Sep 17 00:00:00 2001 From: Gitea Date: Wed, 31 Jul 2024 01:36:58 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=B8=93=E5=AE=B6=E5=88=86=E7=BB=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jeecg/modules/demo/expert/controller/ExpertController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/controller/ExpertController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/controller/ExpertController.java index e375d25e..a2423599 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/controller/ExpertController.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/controller/ExpertController.java @@ -140,7 +140,7 @@ public class ExpertController extends JeecgController { ExpGroup expGroup = new ExpGroup(); QueryWrapper queryWrappereg = QueryGenerator.initQueryWrapper(expGroup, req.getParameterMap()); queryWrappereg.eq("grouid",listce.get(i).getExpid()); - //queryWrappereg.eq("ann_comp_groupid",ndbsxzid); + queryWrappereg.eq("ann_comp_groupid",ndbsxzid); List listeg = expGroupService.list(queryWrappereg); if(listeg.size()==0){ expids = expids+listce.get(i).getExpid()+",";