From e31e6f3488a2da355aa627dad25270cf6638b2cd Mon Sep 17 00:00:00 2001 From: Gitea Date: Tue, 30 Jul 2024 23:34:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A5=96=E9=A1=B9=E5=AF=BC=E5=85=A5=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/awardpersion/controller/AwardPersionController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/awardpersion/controller/AwardPersionController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/awardpersion/controller/AwardPersionController.java index 0e9babc7..55b6f8d1 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/awardpersion/controller/AwardPersionController.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/awardpersion/controller/AwardPersionController.java @@ -546,13 +546,13 @@ public class AwardPersionController extends JeecgController queryWrapperndbs = new QueryWrapper<>(); - queryWrapperndbs.eq("name",list.get(i).getAnnalComp()); + queryWrapperndbs.eq("name",list.get(i).getAnnalComp()).or().eq("id",list.get(i).getAnnalComp()); List listndbs = annualCompService.list(queryWrapperndbs); if(listndbs.size()==0){ return Result.error("文件导入失败:第"+(i+1)+"行年度比赛不存在"); } QueryWrapper queryWrapperndbsxm = new QueryWrapper<>(); - queryWrapperndbsxm.eq("obj_name",list.get(i).getAnnualCompP()); + queryWrapperndbsxm.eq("obj_name",list.get(i).getAnnualCompP()).or().eq("id",list.get(i).getAnnualCompP()); List listndbsxm = annualCompPointService.list(queryWrapperndbsxm); if(listndbsxm.size()==0){ return Result.error("文件导入失败:第"+(i+1)+"行年度比赛项目不存在");