From bfa9c5c0d856211543563509945618d9481a1869 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=AE=B6=E4=B8=9C?= <1654135867@qq.com>
Date: Sat, 20 Jul 2024 08:33:53 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=8A=A0=E4=B8=80=E4=B8=AA=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E5=BD=93=E6=B2=A1=E6=9C=89=E5=B9=B4=E5=BA=A6=E6=AF=94?=
 =?UTF-8?q?=E8=B5=9B=E7=9A=84=E6=97=B6=E5=80=99=E8=BF=94=E5=9B=9E=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AnnualCompetitionProjectRegistrationController.java        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompetitionprojectregistration/controller/AnnualCompetitionProjectRegistrationController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompetitionprojectregistration/controller/AnnualCompetitionProjectRegistrationController.java
index 23a46017..913273c3 100644
--- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompetitionprojectregistration/controller/AnnualCompetitionProjectRegistrationController.java
+++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompetitionprojectregistration/controller/AnnualCompetitionProjectRegistrationController.java
@@ -1192,6 +1192,9 @@ public class AnnualCompetitionProjectRegistrationController {
             }
 
         }
+        if(map.isEmpty()){
+            return Result.error("无可用的比赛项目");
+        }
         return Result.OK(map);
     }
 

From 749270ceeda0406ee5b597530e3856cc11795920 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=AE=B6=E4=B8=9C?= <1654135867@qq.com>
Date: Sat, 20 Jul 2024 16:25:18 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=80=89=E9=A2=98=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E4=B8=8D=E8=AE=B8=E5=AF=BC=E5=85=A5=E5=92=8C=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=EF=BC=9B=E8=83=BD=E5=8A=9B=E4=B8=8D=E8=83=BD=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/BasicsskillController.java     |  4 ++--
 .../demo/basicsskill/entity/Basicsskill.java  |  2 +-
 .../ChaoseTopicPersionList.vue                |  8 ++++----
 .../ChaoseTopicPersionList1.vue               | 20 +++++++++----------
 .../ChaoseTopicPersionList2.vue               | 20 +++++++++----------
 5 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/basicsskill/controller/BasicsskillController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/basicsskill/controller/BasicsskillController.java
index 460c034d..bd8060fa 100644
--- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/basicsskill/controller/BasicsskillController.java
+++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/basicsskill/controller/BasicsskillController.java
@@ -297,7 +297,7 @@ public class BasicsskillController extends JeecgController<Basicsskill, IBasicss
     * @param request
     * @param basicsskill
     */
-    @RequiresPermissions("basicsskill:basicsskill:exportXls")
+    /*@RequiresPermissions("basicsskill:basicsskill:exportXls")*/
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, Basicsskill basicsskill) {
 		return super.exportXls(request, basicsskill, Basicsskill.class, "基础能力设置");
@@ -310,7 +310,7 @@ public class BasicsskillController extends JeecgController<Basicsskill, IBasicss
     * @param response
     * @return
     */
-    @RequiresPermissions("basicsskill:basicsskill:importExcel")
+/*    @RequiresPermissions("basicsskill:basicsskill:importExcel")*/
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
 		return super.importExcel(request, response, Basicsskill.class);
diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/basicsskill/entity/Basicsskill.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/basicsskill/entity/Basicsskill.java
index 2cd40fa8..d349d3d3 100644
--- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/basicsskill/entity/Basicsskill.java
+++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/basicsskill/entity/Basicsskill.java
@@ -52,7 +52,7 @@ public class Basicsskill implements Serializable {
     @ApiModelProperty(value = "所属部门")
     private String sysOrgCode;
 	/**上级*/
-	@Excel(name = "上级", width = 15)
+	/*@Excel(name = "上级", width = 15)*/
     @ApiModelProperty(value = "上级")
     private String pid;
 	/**名称*/
diff --git a/jeecgboot-vue3-master/src/views/chooseTopicPersion/ChaoseTopicPersionList.vue b/jeecgboot-vue3-master/src/views/chooseTopicPersion/ChaoseTopicPersionList.vue
index 519af0d8..efeb5692 100644
--- a/jeecgboot-vue3-master/src/views/chooseTopicPersion/ChaoseTopicPersionList.vue
+++ b/jeecgboot-vue3-master/src/views/chooseTopicPersion/ChaoseTopicPersionList.vue
@@ -12,13 +12,13 @@
     <BasicTable @register="registerTable" :rowSelection="rowSelection">
       <!--插槽:table标题-->
       <template #tableTitle>
-        <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增
-        </a-button>
+<!--        <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增
+        </a-button>-->
         <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出
         </a-button>
-        <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">
+<!--        <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">
           导入
-        </j-upload-button>
+        </j-upload-button>-->
         <a-dropdown v-if="selectedRowKeys.length > 0">
           <template #overlay>
             <a-menu>
diff --git a/jeecgboot-vue3-master/src/views/chooseTopicPersion/ChaoseTopicPersionList1.vue b/jeecgboot-vue3-master/src/views/chooseTopicPersion/ChaoseTopicPersionList1.vue
index 80fa970a..0d5b7286 100644
--- a/jeecgboot-vue3-master/src/views/chooseTopicPersion/ChaoseTopicPersionList1.vue
+++ b/jeecgboot-vue3-master/src/views/chooseTopicPersion/ChaoseTopicPersionList1.vue
@@ -11,9 +11,9 @@
     <BasicTable @register="registerTable" :rowSelection="rowSelection">
       <!--插槽:table标题-->
       <template #tableTitle>
-        <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+<!--        <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>-->
         <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-        <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+<!--        <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>-->
         <a-dropdown v-if="selectedRowKeys.length > 0">
           <template #overlay>
             <a-menu>
@@ -113,7 +113,7 @@
     registerModal.value.disableSubmit = false;
     registerModal.value.add();
   }
-  
+
   /**
    * 编辑事件
    */
@@ -122,7 +122,7 @@
     registerModal1.value.disableSubmit = false;
     registerModal1.value.edit(record);
   }
-   
+
   /**
    * 详情
    */
@@ -130,28 +130,28 @@
     registerModal.value.disableSubmit = true;
     registerModal.value.edit(record);
   }
-   
+
   /**
    * 删除事件
    */
   async function handleDelete(record) {
     await deleteOne({ id: record.id }, handleSuccess);
   }
-   
+
   /**
    * 批量删除事件
    */
   async function batchHandleDelete() {
     await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
   }
-   
+
   /**
    * 成功回调
    */
   function handleSuccess() {
     (selectedRowKeys.value = []) && reload();
   }
-   
+
   /**
    * 操作栏
    */
@@ -171,7 +171,7 @@
   function searchQuery() {
     reload();
   }
-  
+
   /**
    * 重置
    */
@@ -181,7 +181,7 @@
     //刷新数据
     reload();
   }
-  
+
 
 
 
diff --git a/jeecgboot-vue3-master/src/views/chooseTopicPersion/ChaoseTopicPersionList2.vue b/jeecgboot-vue3-master/src/views/chooseTopicPersion/ChaoseTopicPersionList2.vue
index 6060bb1b..ea186c8e 100644
--- a/jeecgboot-vue3-master/src/views/chooseTopicPersion/ChaoseTopicPersionList2.vue
+++ b/jeecgboot-vue3-master/src/views/chooseTopicPersion/ChaoseTopicPersionList2.vue
@@ -11,9 +11,9 @@
     <BasicTable @register="registerTable" :rowSelection="rowSelection">
       <!--插槽:table标题-->
       <template #tableTitle>
-        <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+<!--        <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>-->
         <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-        <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+<!--        <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>-->
         <a-dropdown v-if="selectedRowKeys.length > 0">
           <template #overlay>
             <a-menu>
@@ -113,7 +113,7 @@
     registerModal.value.disableSubmit = false;
     registerModal.value.add();
   }
-  
+
   /**
    * 编辑事件
    */
@@ -125,7 +125,7 @@
     registerModal1.value.disableSubmit = true;
     registerModal1.value.edit(record);
   }
-   
+
   /**
    * 详情
    */
@@ -133,28 +133,28 @@
     registerModal.value.disableSubmit = true;
     registerModal.value.edit(record);
   }
-   
+
   /**
    * 删除事件
    */
   async function handleDelete(record) {
     await deleteOne({ id: record.id }, handleSuccess);
   }
-   
+
   /**
    * 批量删除事件
    */
   async function batchHandleDelete() {
     await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
   }
-   
+
   /**
    * 成功回调
    */
   function handleSuccess() {
     (selectedRowKeys.value = []) && reload();
   }
-   
+
   /**
    * 操作栏
    */
@@ -174,7 +174,7 @@
   function searchQuery() {
     reload();
   }
-  
+
   /**
    * 重置
    */
@@ -184,7 +184,7 @@
     //刷新数据
     reload();
   }
-  
+