From fcd57ead6c85fa4338ec52f112e80e240244fef6 Mon Sep 17 00:00:00 2001
From: "@jyuhsin" <729757837@qq.com>
Date: Fri, 22 Aug 2025 10:02:51 +0800
Subject: [PATCH] commit

---
 .../controller/CondolenceTypeController.java  |  3 +-
 .../staffbenefit/condolence/apply/index.html  | 32 +++++++++++--------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceTypeController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceTypeController.java
index 974666cd..1924d4c2 100644
--- a/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceTypeController.java
+++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceTypeController.java
@@ -1,5 +1,6 @@
 package com.budwk.app.zhgh.staffbenefit.condolence.controller;
 
+import cn.dev33.satoken.annotation.SaCheckLogin;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.util.StrUtil;
 import com.budwk.app.base.annotation.SLog;
@@ -82,7 +83,7 @@ public class CondolenceTypeController {
 
 	@At
 	@ApiOperation("查询职工慰问类型")
-	@SaCheckPermission("condolence.type")
+	@SaCheckLogin
 	public Result queryCondolenceType() {
 		List<CondolenceType> list = typeService.query(Cnd.NEW().desc(CondolenceType::getCode));
 		return Result.success(list);
diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/condolence/apply/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/condolence/apply/index.html
index 9ae8fab9..cb133338 100644
--- a/src/main/resources/views/platform/zhgh/staffbenefit/condolence/apply/index.html
+++ b/src/main/resources/views/platform/zhgh/staffbenefit/condolence/apply/index.html
@@ -281,20 +281,24 @@ layout("/layouts/platform.html"){
         })
       },
       onSubmit() {
-        this.$confirm("您确定要提交吗？", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-          this.$axios.post('/platform/condolence/apply/submit', {
-            data: JSON.stringify(this.formData),
-            taskId: GetQueryString("taskId")
-          }).then(res => {
-            if (res.code === 0) {
-              this.$message.success(res.msg)
-              window.location.href = '/platform/condolence/mine'
-            }
-          })
+        this.$refs.formRef.validate((valid) => {
+          if (valid) {
+            this.$confirm("您确定要提交吗？", "提示", {
+              confirmButtonText: "确定",
+              cancelButtonText: "取消",
+              type: "warning"
+            }).then(() => {
+              this.$axios.post('/platform/condolence/apply/submit', {
+                data: JSON.stringify(this.formData),
+                taskId: GetQueryString("taskId")
+              }).then(res => {
+                if (res.code === 0) {
+                  this.$message.success(res.msg)
+                  window.location.href = '/platform/condolence/mine'
+                }
+              })
+            })
+          }
         })
       },
       onFinishTask() {