From b3b275f0db5dab8f5273c80c1748c4698f9005ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=AE=B6=E4=B8=9C?= <1654135867@qq.com> Date: Thu, 7 Dec 2023 08:50:04 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=89=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jeecg/modules/demo/topic/controller/TopicController.java | 2 +- .../src/views/annualCompPoint/student/AnnualCompPointList.vue | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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 59b1cb1f..1d9126ac 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 @@ -278,7 +278,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()); Topic one = topicService.getOne(queryWrapper); if (!Objects.equals(one.getId(), topic.getId())){ return Result.error("编码重复"); diff --git a/jeecgboot-vue3-master/src/views/annualCompPoint/student/AnnualCompPointList.vue b/jeecgboot-vue3-master/src/views/annualCompPoint/student/AnnualCompPointList.vue index f2c5e90c..c29f4f8d 100644 --- a/jeecgboot-vue3-master/src/views/annualCompPoint/student/AnnualCompPointList.vue +++ b/jeecgboot-vue3-master/src/views/annualCompPoint/student/AnnualCompPointList.vue @@ -228,12 +228,12 @@ // 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') { actions.unshift({ label: '选题',