diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/topic/controller/TopicController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/topic/controller/TopicController.java index 86e9c8c3..59b1cb1f 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/topic/controller/TopicController.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/topic/controller/TopicController.java @@ -210,7 +210,7 @@ public class TopicController extends JeecgController { @PostMapping(value = "/select") public Result select(@RequestBody Topic topic) { QueryWrapper queryWrapper= new QueryWrapper<>(); - queryWrapper.eq("number",topic.getNumber()); + queryWrapper.eq("annual_compid",topic.getAnnualCompid()).eq("number",topic.getNumber()); List list = topicService.list(queryWrapper); if (!list.isEmpty()){ return Result.error("编码重复"); @@ -236,7 +236,7 @@ public class TopicController extends JeecgController { } } QueryWrapper queryWrapper= new QueryWrapper<>(); - queryWrapper.eq("number",topic.getNumber()); + queryWrapper.eq("annual_compid",topic.getAnnualCompid()).eq("number",topic.getNumber()); List list = topicService.list(queryWrapper); if (!list.isEmpty()){ return Result.error("编码重复"); diff --git a/jeecgboot-vue3-master/src/views/UpfilePersion/UpfilePersionList.vue b/jeecgboot-vue3-master/src/views/UpfilePersion/UpfilePersionList.vue index 40508eb6..5db6dd33 100644 --- a/jeecgboot-vue3-master/src/views/UpfilePersion/UpfilePersionList.vue +++ b/jeecgboot-vue3-master/src/views/UpfilePersion/UpfilePersionList.vue @@ -174,7 +174,7 @@ (async (router) => { isCommittee.value = await judgeRoles({ roles: 'committee' }); isSuperAdmin.value = await judgeRoles({ roles: 'superAdmin' }); - isStu.value = await judgeRoles({ roles: 'user' }); + isStu.value = await judgeRoles({ roles: 'xs' }); isReg.value = await judgeReg({ annualCompPointId: route.query.annualCompPointId }); // 学生是否报名 if (isStu.value && !isReg.value) { diff --git a/jeecgboot-vue3-master/src/views/annualCompPoint/student/AnnualCompPointList.vue b/jeecgboot-vue3-master/src/views/annualCompPoint/student/AnnualCompPointList.vue index 1fee1b79..f2c5e90c 100644 --- a/jeecgboot-vue3-master/src/views/annualCompPoint/student/AnnualCompPointList.vue +++ b/jeecgboot-vue3-master/src/views/annualCompPoint/student/AnnualCompPointList.vue @@ -228,18 +228,18 @@ // onClick: handleSubmitandApply.bind(null, record), // }); // } - if (record.requireUploadWorks === 'Y') { +/* if (record.requireUploadWorks === 'Y') { actions.unshift({ label: '作品管理', onClick: workManage.bind(null, record), }); - } - if (record.requireTopic === 'Y' && record.annualCompState === '2') { + }*/ + /*if (record.requireTopic === 'Y' && record.annualCompState === '2') { actions.unshift({ label: '选题', onClick: handleSubmitandApply.bind(null, record), }); - } + }*/ return actions; }