From 45121f7b2e21465c9e32c5d58cba2dea9a407795 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=8C=E5=85=88=E8=88=9C?= <2499071264@qq.com>
Date: Fri, 9 Oct 2026 17:30:07 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=9B=B0=E9=9A=BE=E5=B8=AE=E6=89=B6=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/DifficultHelpReadingController.java     |  3 ---
 .../zhgh/staffbenefit/difficulthelp/apply/form.html    |  8 ++++----
 .../zhgh/staffbenefit/difficulthelp/apply/index.html   | 10 +++++-----
 .../difficulthelp/branchunionapproval/index.html       |  4 ++--
 .../zhgh/staffbenefit/difficulthelp/mine/index.html    |  4 ++--
 .../zhgh/staffbenefit/difficulthelp/reading/index.html |  4 ++--
 .../difficulthelp/schoolunionapproval/index.html       |  4 ++--
 .../difficulthelp/unionLeaderApproval/index.html       |  4 ++--
 8 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpReadingController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpReadingController.java
index 9bf893f..b0fb63c 100644
--- a/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpReadingController.java
+++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpReadingController.java
@@ -398,9 +398,6 @@ public class DifficultHelpReadingController {
                 if (!taskKeys[i].equals(task.getTaskName())) continue;
                 cn.hutool.core.lang.Dict data = taskVO.getTaskFormData();
                 String opinion = StrUtil.nullToEmpty(data.getStr("opinion"));
-                if (i < 2 && data.get("money") != null) {
-                    opinion += "\n级别：" + StrUtil.nullToEmpty(data.getStr("level")) + "  帮扶金额：" + data.get("money") + "元";
-                }
                 docData.put(fields[i] + "Opinion", opinion);
                 docData.put(fields[i] + "User", StrUtil.nullToEmpty(data.getStr("userName")));
                 if (StrUtil.isNotBlank(data.getStr("sign"))) {
diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/apply/form.html b/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/apply/form.html
index ef34618..3364848 100644
--- a/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/apply/form.html
+++ b/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/apply/form.html
@@ -426,10 +426,10 @@
 					this.$set(this.formData, 'proxyLoginName', user.loginname)
 					this.$set(this.formData, 'mode', "1")
 					this.$set(this.formData, 'sex', user.sex)
-					this.$set(this.formData, 'unitId', user.unit.id)
-					this.$set(this.formData, 'unitName', user.unit.name)
-					this.$set(this.formData, 'unionId', user.union.id)
-					this.$set(this.formData, 'unionName', user.union.name)
+					this.$set(this.formData, 'unitId', (user.unit || {}).id || user.unitId || null)
+					this.$set(this.formData, 'unitName', (user.unit || {}).name || '')
+					this.$set(this.formData, 'unionId', (user.union || {}).id || (user.unit || {}).unionId || null)
+					this.$set(this.formData, 'unionName', (user.union || {}).name || '')
 					this.$set(this.formData, 'monthlyIncome', null)
 					this.$set(this.formData, 'birthday', user.birthday)
 					this.$set(this.formData, 'mobile', user.mobile)
diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/apply/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/apply/index.html
index f84d25f..425be24 100644
--- a/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/apply/index.html
+++ b/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/apply/index.html
@@ -297,7 +297,7 @@ layout("/layouts/platform.html"){
 	</el-card>
 	<div v-else>
 		<el-card class="box-card" style="height: 92vh" shadow="never">
-			<el-result icon="warning" title="温馨提醒" subTitle="">
+			<el-result icon="warning" title="温馨提醒" sub-title="">
 				<template slot="extra">
 					<span v-if="blockMessage">{{blockMessage}}</span>
 					<span v-else>抱歉，当前时间不能申请，可申请时间为{{time}}。</span>
@@ -495,10 +495,10 @@ layout("/layouts/platform.html"){
 					this.$set(this.formData, 'proxyLoginName', user.loginname)
 					this.$set(this.formData, 'mode', "1")
 					this.$set(this.formData, 'sex', user.sex)
-					this.$set(this.formData, 'unitId', user.unit.id)
-					this.$set(this.formData, 'unitName', user.unit.name)
-					this.$set(this.formData, 'unionId', user.union.id)
-					this.$set(this.formData, 'unionName', user.union.name)
+					this.$set(this.formData, 'unitId', (user.unit || {}).id || user.unitId || null)
+					this.$set(this.formData, 'unitName', (user.unit || {}).name || '')
+					this.$set(this.formData, 'unionId', (user.union || {}).id || (user.unit || {}).unionId || null)
+					this.$set(this.formData, 'unionName', (user.union || {}).name || '')
 					this.$set(this.formData, 'yearIncome', null)
 					this.$set(this.formData, 'birthday', user.birthday)
 					this.$set(this.formData, 'idCard', user.idCard)
diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/branchunionapproval/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/branchunionapproval/index.html
index 821deab..805cfa4 100644
--- a/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/branchunionapproval/index.html
+++ b/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/branchunionapproval/index.html
@@ -350,7 +350,7 @@ layout("/layouts/platform.html"){
 				if (this.$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')) {
 					this.units = await this.$businessTool.listUnit(this.pageForm.unionId)
 				} else {
-					this.units = await this.$businessTool.listUnit(this.$store.state.user.union.id)
+					this.units = await this.$businessTool.listUnit((this.$store.state.user.union || {}).id || this.pageForm.unionId)
 				}
 			},
 			handleSelectionChange: function (val) {
@@ -362,7 +362,7 @@ layout("/layouts/platform.html"){
 			if (this.$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')) {
 				this.unions = await this.$businessTool.listUnion()
 			} else {
-				this.unions = await this.$businessTool.listUnion(this.$store.state.user.union.id)
+				this.unions = await this.$businessTool.listUnion((this.$store.state.user.union || {}).id)
 			}
 		}
 	})
diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/mine/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/mine/index.html
index 27d35e3..4f39ebd 100644
--- a/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/mine/index.html
+++ b/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/mine/index.html
@@ -184,7 +184,7 @@ layout("/layouts/platform.html"){
 				if (this.$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')) {
 					this.units = await this.$businessTool.listUnit(this.pageForm.unionId)
 				} else {
-					this.units = await this.$businessTool.listUnit(this.$store.state.user.union.id)
+					this.units = await this.$businessTool.listUnit((this.$store.state.user.union || {}).id || this.pageForm.unionId)
 				}
 			},
 			doExportApply(row, format) {
@@ -196,7 +196,7 @@ layout("/layouts/platform.html"){
 			if (this.$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')) {
 				this.unions = await this.$businessTool.listUnion()
 			} else {
-				this.unions = await this.$businessTool.listUnion(this.$store.state.user.union.id)
+				this.unions = await this.$businessTool.listUnion((this.$store.state.user.union || {}).id)
 			}
 		}
 	})
diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/reading/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/reading/index.html
index ea36bdf..c6ee67d 100644
--- a/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/reading/index.html
+++ b/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/reading/index.html
@@ -181,7 +181,7 @@ layout("/layouts/platform.html"){
 				if (this.$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')) {
 					this.units = await this.$businessTool.listUnit(this.pageForm.unionId)
 				} else {
-					this.units = await this.$businessTool.listUnit(this.$store.state.user.union.id)
+					this.units = await this.$businessTool.listUnit((this.$store.state.user.union || {}).id || this.pageForm.unionId)
 				}
 			},
 			exportYearPayRecord(){
@@ -207,7 +207,7 @@ layout("/layouts/platform.html"){
 			if (this.$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')) {
 				this.unions = await this.$businessTool.listUnion()
 			} else {
-				this.unions = await this.$businessTool.listUnion(this.$store.state.user.union.id)
+				this.unions = await this.$businessTool.listUnion((this.$store.state.user.union || {}).id)
 			}
 		}
 	})
diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/schoolunionapproval/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/schoolunionapproval/index.html
index e1dd280..aa576e5 100644
--- a/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/schoolunionapproval/index.html
+++ b/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/schoolunionapproval/index.html
@@ -296,7 +296,7 @@ layout("/layouts/platform.html"){
 				if (this.$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')) {
 					this.units = await this.$businessTool.listUnit(this.pageForm.unionId)
 				} else {
-					this.units = await this.$businessTool.listUnit(this.$store.state.user.union.id)
+					this.units = await this.$businessTool.listUnit((this.$store.state.user.union || {}).id || this.pageForm.unionId)
 				}
 			},
 		},
@@ -305,7 +305,7 @@ layout("/layouts/platform.html"){
 			if (this.$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')) {
 				this.unions = await this.$businessTool.listUnion()
 			} else {
-				this.unions = await this.$businessTool.listUnion(this.$store.state.user.union.id)
+				this.unions = await this.$businessTool.listUnion((this.$store.state.user.union || {}).id)
 			}
 		}
 	})
diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/unionLeaderApproval/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/unionLeaderApproval/index.html
index f426645..182cebe 100644
--- a/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/unionLeaderApproval/index.html
+++ b/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/unionLeaderApproval/index.html
@@ -343,7 +343,7 @@ layout("/layouts/platform.html"){
 				if (this.$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')) {
 					this.units = await this.$businessTool.listUnit(this.pageForm.unionId)
 				} else {
-					this.units = await this.$businessTool.listUnit(this.$store.state.user.union.id)
+					this.units = await this.$businessTool.listUnit((this.$store.state.user.union || {}).id || this.pageForm.unionId)
 				}
 			},
 			handleSelectionChange: function (val) {
@@ -355,7 +355,7 @@ layout("/layouts/platform.html"){
 			if (this.$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')) {
 				this.unions = await this.$businessTool.listUnion()
 			} else {
-				this.unions = await this.$businessTool.listUnion(this.$store.state.user.union.id)
+				this.unions = await this.$businessTool.listUnion((this.$store.state.user.union || {}).id)
 			}
 		}
 	})