From afd9016ef8240fb4cfea0065b9bac7625496f544 Mon Sep 17 00:00:00 2001 From: zhangrui Date: Wed, 6 May 2026 19:34:13 +0800 Subject: [PATCH] 1 --- .../zhgh/welfare/model/WelfareProject.java | 2 +- .../views/platform/sys/msg/summary/index.html | 21 +++++++++++++++---- .../zhgh/welfare/select/optionSelect.js | 2 +- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/budwk/app/zhgh/welfare/model/WelfareProject.java b/src/main/java/com/budwk/app/zhgh/welfare/model/WelfareProject.java index 23c73483..fd7fa498 100644 --- a/src/main/java/com/budwk/app/zhgh/welfare/model/WelfareProject.java +++ b/src/main/java/com/budwk/app/zhgh/welfare/model/WelfareProject.java @@ -214,7 +214,7 @@ public class WelfareProject extends BaseModel implements SysHomeConvert { sysHomeActivity.setH5Url("/platform/h5/welfare/userSelect/index?id=" + this.getId()); sysHomeActivity.setStartDate(this.getChoiceTimeStart()); sysHomeActivity.setEndDate(this.getChoiceTimeEnd()); - sysHomeActivity.setAllowUserSql("select userId from welfare_list where projectId = '" + this.getId() + "' and userId = @userId"); + sysHomeActivity.setAllowUserSql("select userId from welfare_list where projectId = (select id from welfare_project where id='" + this.getId() + "' and provideMode!=1) and userId = @userId "); sysHomeActivity.setEnable(true); sysHomeActivity.setClassPath(this.getClass().getPackageName() + this.getClass().getName()); return sysHomeActivity; diff --git a/src/main/resources/views/platform/sys/msg/summary/index.html b/src/main/resources/views/platform/sys/msg/summary/index.html index bda2d0fd..ef396441 100644 --- a/src/main/resources/views/platform/sys/msg/summary/index.html +++ b/src/main/resources/views/platform/sys/msg/summary/index.html @@ -79,9 +79,19 @@ layout("/layouts/platform.html"){ -
- -
+ + + + +
+ +
+
+ + + +
+
@@ -108,7 +118,7 @@ layout("/layouts/platform.html"){ readType: null }, unionList: [], - unitList: [] + unitList: [], } }, components: {}, @@ -127,6 +137,9 @@ layout("/layouts/platform.html"){ this.doSearch() }, viewFiles(row) { + this.backFormData = { + ...row + } this.backFiles = row.backFiles this.backDialogVisible = true }, diff --git a/src/main/resources/views/platform/zhgh/welfare/select/optionSelect.js b/src/main/resources/views/platform/zhgh/welfare/select/optionSelect.js index 98bbfa4d..aa5f859a 100644 --- a/src/main/resources/views/platform/zhgh/welfare/select/optionSelect.js +++ b/src/main/resources/views/platform/zhgh/welfare/select/optionSelect.js @@ -179,7 +179,7 @@ const optionSelect = { - +