diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompgroup/controller/AnnualCompGroupController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompgroup/controller/AnnualCompGroupController.java
index edbb7b0b..f49f625b 100644
--- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompgroup/controller/AnnualCompGroupController.java
+++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompgroup/controller/AnnualCompGroupController.java
@@ -383,14 +383,14 @@ public class AnnualCompGroupController extends JeecgController<AnnualCompGroup,
 		 //queryWrapperagt.eq("ann_com_gro_topid",xmtmid);
 		 queryWrapperagt.in("annid", annualids);
 		 queryWrapperagt.in("ann_com_p", annualcpids);
-		 List<AnnComGroTopP> listact = annComGroTopPService.list(queryWrapperagt);
-		 String str = "";
+		 annComGroTopPService.remove(queryWrapperagt);
+/*		 String str = "";
 		 for (int i = 0; i < listact.size(); i++) {
 			 str = str + listact.get(i).getBmcode() + ",";
 		 }
 		 if (str != "") {
 			 queryWrapperup.notIn("apply_code", str.split(","));
-		 }
+		 }*/
 		 List<UpfilePersion> listup = upfilePersionService.list(queryWrapperup);
 		 //作品的年度比赛项目必须和组的年度比赛项目相同才可以分配作品
 		 for (int o = 0; o < listup.size(); o++) {
diff --git a/jeecgboot-vue3-master/src/views/annualcompgroup/AnnualCompGroup.api.ts b/jeecgboot-vue3-master/src/views/annualcompgroup/AnnualCompGroup.api.ts
index 8616152f..0e98f3cb 100644
--- a/jeecgboot-vue3-master/src/views/annualcompgroup/AnnualCompGroup.api.ts
+++ b/jeecgboot-vue3-master/src/views/annualcompgroup/AnnualCompGroup.api.ts
@@ -17,8 +17,16 @@ enum Api {
 }
 
 export const zdfpzp = () => {
-  let url = Api.zdfpzp;
-  return defHttp.get({ url: url}, { isTransformResponse: false });
+  createConfirm({
+    iconType: 'warning',
+    title: '确认自动分配作品',
+    content: '会清空已分配作品，重新进行分配',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.get({ url: Api.zdfpzp}, { isTransformResponse: true });
+    }
+  });
 }
 
 /**