选题

12 months ago · b3b275f0db
parent 35a6aa9998
commit b3b275f0db
2 changed files with 3 additions and 3 deletions
--- 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<Topic, ITopicService> {
            }
        }
        QueryWrapper<Topic> 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("编码重复");
--- 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: '选题',