diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/controller/ExpertController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/controller/ExpertController.java index f788be8..d742e89 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/controller/ExpertController.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/controller/ExpertController.java @@ -632,7 +632,7 @@ public class ExpertController extends JeecgController { if (expert.getCompopen().equals("1")) { //修改提交审核状态 expertService.handlebackbackfirm(id); - str ="驳回审核!请到编辑页面确定问题数据并填写驳回原因"; + str ="驳回审核!"; } else if (expert.getCompopen().equals("3") || expert.getCompopen().equals("2") ) { str ="已驳回或者是已通过审核"; } diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expproject/controller/ExpprojectController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expproject/controller/ExpprojectController.java index ac98550..043981c 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expproject/controller/ExpprojectController.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expproject/controller/ExpprojectController.java @@ -172,7 +172,14 @@ public class ExpprojectController { if(expprojectEntity==null) { return Result.error("未找到对应数据"); } - if (expproject.getNeedexp()>=expprojectPage.getExpandproList().size()) { + int a=0; + if ( expprojectPage.getExpandproList() != null && !expprojectPage.getExpandproList().isEmpty()) { + a=expprojectPage.getExpandproList().size(); + }else { + a=0; + } + + if (expproject.getNeedexp()>=a) { expprojectService.updateMain(expproject, expprojectPage.getExpandproList()); return Result.OK("编辑成功!"); }else {