diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/chooseTopicPersion/controller/ChaoseTopicPersionController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/chooseTopicPersion/controller/ChaoseTopicPersionController.java index 048e76e2..ee96092f 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/chooseTopicPersion/controller/ChaoseTopicPersionController.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/chooseTopicPersion/controller/ChaoseTopicPersionController.java @@ -197,6 +197,15 @@ public class ChaoseTopicPersionController extends JeecgController bmbhadd(@RequestParam(name="ids",required=true) String ids,@RequestParam(name="xmtmid",required=true) String xmtmid,HttpServletRequest req) { String strs[] = ids.split(","); + for (int o = 0 ; o < strs.length ; o++){ + UpfilePersion upfilePersion = upfilePersionService.getById(strs[o]); + QueryWrapper queryWrapperctp1 = new QueryWrapper<>(); + queryWrapperctp1.eq("bmcode",upfilePersion.getApplyCode()); + List listctp1 = chaoseTopicPersionService.list(queryWrapperctp1); + if(listctp1.size()==0){ + return Result.error(upfilePersion.getTopicName()+"未选题,绑定失败!"); + } + } AnnComGroTop annComGroTop = new AnnComGroTop(); QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(annComGroTop, req.getParameterMap()); queryWrapper.eq("ann_com_p_g",xmtmid); diff --git a/jeecgboot-vue3-master/src/views/annualcompetitionprojectregistration/student/AnnualCompetitionProjectRegistrationList.vue b/jeecgboot-vue3-master/src/views/annualcompetitionprojectregistration/student/AnnualCompetitionProjectRegistrationList.vue index 84bbfb35..4026e3ef 100644 --- a/jeecgboot-vue3-master/src/views/annualcompetitionprojectregistration/student/AnnualCompetitionProjectRegistrationList.vue +++ b/jeecgboot-vue3-master/src/views/annualcompetitionprojectregistration/student/AnnualCompetitionProjectRegistrationList.vue @@ -203,6 +203,12 @@ function getTableAction(record) { label: '选题', onClick: chooseTopic.bind(null, record), }, + { + label: '编辑', + onClick: handleEdit.bind(null, record), + }, + + { label: '详情', onClick: handleDetail.bind(null, record),