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)+"行年度比赛项目不存在");