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"){
- +