From 7dacfd7e5ad01c194ef27c8b521973b1abf13496 Mon Sep 17 00:00:00 2001 From: hongqiwei <1143662660@qq.com> Date: Fri, 30 Oct 2026 14:02:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../services/impl/SysHomeNewsServiceImpl.java | 6 ++--- .../views/layouts/v4/home/index.html | 22 ++++++++++++++++++- .../resources/views/layouts/v4/home/user.js | 20 ++++++++--------- .../zhgh/democratic/proposal/common/info.js | 6 +++++ .../member/apply/common/commonQuery.html | 3 ++- .../member/apply/common/commonQuery.js | 4 +++- .../member/change/common/commonQuery.html | 3 ++- .../member/change/common/commonQuery.js | 6 +++-- .../member/change/common/memberChange.js | 3 ++- .../member/change/manage/index.html | 17 +++++++++----- .../member/change/record/index.html | 9 +++++--- .../member/common/info/memberInfo.js | 4 +++- .../member/info/common/commonQuery.html | 3 ++- .../member/info/common/commonQuery.js | 6 +++-- .../member/info/common/memberAddForm.js | 3 ++- .../member/info/history/index.html | 11 ++++++---- .../staffmanage/member/info/input/index.html | 9 +++++--- .../member/statistics/analysis/index.html | 6 +++-- .../statistics/comprehensive/index.html | 11 +++++++--- .../statistics/comprehensive/queryForm.js | 2 +- .../member/statistics/summary/index.html | 6 +++-- 21 files changed, 110 insertions(+), 50 deletions(-) diff --git a/src/main/java/com/budwk/app/sys/services/impl/SysHomeNewsServiceImpl.java b/src/main/java/com/budwk/app/sys/services/impl/SysHomeNewsServiceImpl.java index 3528ba5..3f614f2 100644 --- a/src/main/java/com/budwk/app/sys/services/impl/SysHomeNewsServiceImpl.java +++ b/src/main/java/com/budwk/app/sys/services/impl/SysHomeNewsServiceImpl.java @@ -1,6 +1,5 @@ package com.budwk.app.sys.services.impl; -import com.budwk.app.base.exception.BaseException; import com.budwk.app.sys.services.SysHomeNewsService; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; @@ -35,7 +34,7 @@ public class SysHomeNewsServiceImpl implements SysHomeNewsService { /** * 无需参数，一次抓取首页中的三个栏目，并保留原有一天有效期的缓存写入。 * - * @return label/value 栏目列表，文章包含 text/time/href；正常空栏目返回空列表。 + * @return label/value 栏目列表，文章包含 text/time/href；无文章的栏目保留空列表，抓取失败返回空栏目列表。 */ @Override @Aop(TransAop.READ_COMMITTED) @@ -51,7 +50,8 @@ public class SysHomeNewsServiceImpl implements SysHomeNewsService { return news; } catch (IOException e) { log.warn("获取重庆工贸职业技术学院工会首页失败", e); - throw new BaseException("学校工会网站暂时无法访问，请稍后重试"); + // 学校网站连接失败或超时时返回空列表，让首页展示空状态，不向用户报错，也不覆盖已有缓存。 + return new ArrayList<>(); } } diff --git a/src/main/resources/views/layouts/v4/home/index.html b/src/main/resources/views/layouts/v4/home/index.html index 53aeaed..1b1457e 100644 --- a/src/main/resources/views/layouts/v4/home/index.html +++ b/src/main/resources/views/layouts/v4/home/index.html @@ -120,6 +120,18 @@ layout("/layouts/v4/baseLayout.html"){ + + +
@@ -140,7 +152,7 @@ layout("/layouts/v4/baseLayout.html"){
- +
@@ -181,7 +193,15 @@ layout("/layouts/v4/baseLayout.html"){ new Vue({ el: '#v4-home-app', data(){ + // 浏览器读取属性时还原 HTML 转义；未配置单位或工会时使用空字符串，不访问空对象。 + const profileData = document.getElementById('v4-home-profile-data').dataset return{ + memberProfile: { + username: profileData.username || '', + loginname: profileData.loginname || '', + unitName: profileData.unitName || '', + unionName: profileData.unionName || '' + }, websiteNews: [], activityBrowse: {enabled: false, label: '活动加载中'} } diff --git a/src/main/resources/views/layouts/v4/home/user.js b/src/main/resources/views/layouts/v4/home/user.js index 9ba4862..e5e38f0 100644 --- a/src/main/resources/views/layouts/v4/home/user.js +++ b/src/main/resources/views/layouts/v4/home/user.js @@ -9,7 +9,7 @@ const user = {
-
欢迎回来
${@auth.getPrincipalProperty('username')}
+
欢迎回来
{{ profile.username }}
@@ -17,7 +17,7 @@ const user = {
工号 - ${@auth.getPrincipalProperty('loginname')} + {{ profile.loginname }}
@@ -26,14 +26,7 @@ const user = {
单位信息 - - ${@auth.getPrincipalProperty('unit').getName()} - - ( - - ${@auth.getPrincipalProperty('union').getName()} - - ) + {{ profile.unitName }} ({{ profile.unionName }})
@@ -108,7 +101,12 @@ const user = { mixins: [initTableMixins], // 同一组件分别承载会员卡和待办卡，各自只加载需要的数据。 props: { - profileOnly: { type: Boolean, default: false } + profileOnly: { type: Boolean, default: false }, + // 首页传入显示资料：username 姓名、loginname 工号、unitName 单位、unionName 工会；缺项显示空文本。 + profile: { + type: Object, + default: () => ({username: '', loginname: '', unitName: '', unionName: ''}) + } }, data() { return { diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/common/info.js b/src/main/resources/views/platform/zhgh/democratic/proposal/common/info.js index f212cbc..1e20366 100644 --- a/src/main/resources/views/platform/zhgh/democratic/proposal/common/info.js +++ b/src/main/resources/views/platform/zhgh/democratic/proposal/common/info.js @@ -403,6 +403,12 @@ const PROPOSAL_INFO = { }, openChart(){ + // 仅保存的提案尚未创建 WF 实例，按提案流程 KEY 预览流程定义图。 + if (!this.row.instanceId) { + this.$refs.snakerChartRef.onOpen("JDHTA_NC") + return + } + // 已提交提案使用实例对应的流程版本，保留实际办理节点和审批进度。 this.$refs.snakerChartRef.onOpenFull(this.row.instanceProcessDefineId, this.row.instanceId) } }, diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/commonQuery.html b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/commonQuery.html index 19ed14a..c7b02eb 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/commonQuery.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/commonQuery.html @@ -40,7 +40,8 @@ --> - + + --> - + + diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/commonQuery.js b/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/commonQuery.js index 2fb4d15..400e67d 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/commonQuery.js +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/commonQuery.js @@ -32,8 +32,10 @@ const COMMON_QUERY = { pageForm.userStates = JSON.stringify(this.pageForm.userStates) pageForm.personTypes = JSON.stringify(this.pageForm.personTypes) pageForm.preparedBys = JSON.stringify(this.pageForm.preparedBys) - // 多选人员属性沿用现有数组查询参数的JSON提交方式。 - pageForm.userAttributes = JSON.stringify(this.pageForm.userAttributes) + // 保持其他业务筛选条件，排除已屏蔽字段。 + // 人员属性已屏蔽，查询和导出均不再按该字段过滤。 + pageForm.userAttribute = "" + pageForm.userAttributes = "[]" this.$emit('search', pageForm) }, async initData(){ diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/memberChange.js b/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/memberChange.js index fae0f78..23eb0e9 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/memberChange.js +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/memberChange.js @@ -149,7 +149,8 @@ const MEMBER_CHANGE = { :disabled="allowFields('personType')" style="width: 100%"> - + + diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/change/manage/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/change/manage/index.html index 4c4b0b7..00073e4 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/change/manage/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/change/manage/index.html @@ -50,7 +50,8 @@ layout("/layouts/platform.html"){ - + + @@ -76,7 +77,7 @@ layout("/layouts/platform.html"){ 设置人员分类 - 设置人员属性 @@ -240,6 +241,7 @@ layout("/layouts/platform.html"){ @@ -569,7 +571,8 @@ layout("/layouts/platform.html"){ { prop: "personType", label: "人员类型", width: 120, sortable: true }, // 临时屏蔽“人员分类”列表字段，不删除配置，后续需要可恢复。 // { prop: "aidFundMemberUserType", label: "人员分类", width: 120, sortable: true }, - { prop: "userAttribute", label: "人员属性", width: 120, sortable: true }, + // 屏蔽人员属性列，同时从导出可选列中排除。 + // { prop: "userAttribute", label: "人员属性", width: 120, sortable: true }, { prop: "idCardType", label: "证件类型", width: 120, sortable: true, checked: 0 }, { prop: "idCard", label: "证件号码", width: 120, sortable: true, checked: 0 }, { prop: "marriage", label: "婚姻状况", width: 120, sortable: true, checked: 0 }, @@ -597,13 +600,15 @@ layout("/layouts/platform.html"){ "member-all-change": MEMBER_ALL_CHANGE_INFO, }, methods: { - // 分页和导出共用该参数构建方法，保证人员属性多选值始终按 JSON 数组提交。 + // 分页和导出共用查询参数，排除已屏蔽的人员属性条件。 buildQueryPageForm(source = this.pageForm) { const pageForm = clone(source) - pageForm.userAttributes = JSON.stringify(source.userAttributes || []) + // 人员属性已屏蔽，查询和导出均不再按该字段过滤。 + pageForm.userAttribute = "" + pageForm.userAttributes = "[]" return pageForm }, - // 覆盖公共分页方法，使后端按人员属性集合执行查询。 + // 复用公共分页方法，提交已清理的业务查询参数。 pageData(data = null) { return initTableMixins.methods.pageData.call(this, this.buildQueryPageForm(data || this.pageForm)) }, diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/change/record/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/change/record/index.html index 9651f50..870e1de 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/change/record/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/change/record/index.html @@ -42,7 +42,8 @@ layout("/layouts/platform.html"){ --> - + + @@ -198,8 +199,10 @@ layout("/layouts/platform.html"){ pageForm.personTypes = JSON.stringify(pageForm.personTypes) pageForm.changeTypes = JSON.stringify(pageForm.changeTypes) pageForm.changeOrigins = JSON.stringify(pageForm.changeOrigins) - // 人员属性为多选条件，提交前转换为后端可解析的 JSON 数组。 - pageForm.userAttributes = JSON.stringify(pageForm.userAttributes) + // 人员属性已停用，不参与变更记录筛选。 + // 人员属性已屏蔽，查询和导出均不再按该字段过滤。 + pageForm.userAttribute = "" + pageForm.userAttributes = "[]" this.$axios.post(loc() + '/pageData', pageForm) .then(res => { diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/common/info/memberInfo.js b/src/main/resources/views/platform/zhgh/staffmanage/member/common/info/memberInfo.js index aa4c1c5..5121e68 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/common/info/memberInfo.js +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/common/info/memberInfo.js @@ -73,7 +73,8 @@ const MEMBER_INFO = { {{ viewData.personType }} - {{ viewData.userAttribute }} + + {{ viewData.userAttribute }} {{ viewData.professionalTitle }} {{ viewData.professionalLevel }} @@ -85,6 +86,7 @@ const MEMBER_INFO = { {{ viewData.administrativePositionLevel }} {{ viewData.aidFundMemberUserType }} +
`, store, diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/info/common/commonQuery.html b/src/main/resources/views/platform/zhgh/staffmanage/member/info/common/commonQuery.html index eedae74..89c7077 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/info/common/commonQuery.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/info/common/commonQuery.html @@ -43,7 +43,8 @@ --> - + + diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/info/common/commonQuery.js b/src/main/resources/views/platform/zhgh/staffmanage/member/info/common/commonQuery.js index b5722e2..53c133e 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/info/common/commonQuery.js +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/info/common/commonQuery.js @@ -37,8 +37,10 @@ const COMMON_QUERY = { pageForm.userStates = JSON.stringify(this.pageForm.userStates) pageForm.personTypes = JSON.stringify(this.pageForm.personTypes) pageForm.preparedBys = JSON.stringify(this.pageForm.preparedBys) - // 人员属性多选值按现有数组查询参数口径提交。 - pageForm.userAttributes = JSON.stringify(this.pageForm.userAttributes) + // 保持其他业务筛选条件，排除已屏蔽字段。 + // 人员属性已屏蔽，查询和导出均不再按该字段过滤。 + pageForm.userAttribute = "" + pageForm.userAttributes = "[]" this.$emit('search', pageForm) }, handleUnionChange() { diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/info/common/memberAddForm.js b/src/main/resources/views/platform/zhgh/staffmanage/member/info/common/memberAddForm.js index f4c3eb3..e306a10 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/info/common/memberAddForm.js +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/info/common/memberAddForm.js @@ -102,7 +102,8 @@ style="width: 100%"> - + + diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/info/history/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/info/history/index.html index b0decac..1afe262 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/info/history/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/info/history/index.html @@ -49,7 +49,8 @@ layout("/layouts/platform.html"){ - + + @@ -133,13 +134,15 @@ layout("/layouts/platform.html"){ "member-info": MEMBER_INFO }, methods: { - // 分页和导出共用该参数构建方法，保证人员属性多选值始终按 JSON 数组提交。 + // 分页和导出共用查询参数，排除已屏蔽的人员属性条件。 buildQueryPageForm() { const pageForm = clone(this.pageForm) - pageForm.userAttributes = JSON.stringify(this.pageForm.userAttributes || []) + // 人员属性已屏蔽，查询和导出均不再按该字段过滤。 + pageForm.userAttribute = "" + pageForm.userAttributes = "[]" return pageForm }, - // 覆盖公共分页方法，使后端按人员属性集合执行查询。 + // 复用公共分页方法，提交已清理的业务查询参数。 pageData() { return initTableMixins.methods.pageData.call(this, this.buildQueryPageForm()) }, diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/info/input/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/info/input/index.html index 3ec4178..96e5f34 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/info/input/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/info/input/index.html @@ -49,7 +49,8 @@ layout("/layouts/platform.html"){ - + + @@ -141,10 +142,12 @@ layout("/layouts/platform.html"){ "member-add-form": MEMBER_ADD_FORM }, methods: { - // 人员属性为多选条件，分页查询前统一转换为后端可接收的 JSON 数组。 + // 分页查询前排除已屏蔽的人员属性条件。 pageData(data = null) { const pageForm = clone(data || this.pageForm) - pageForm.userAttributes = JSON.stringify(this.pageForm.userAttributes || []) + // 人员属性已屏蔽，查询和导出均不再按该字段过滤。 + pageForm.userAttribute = "" + pageForm.userAttributes = "[]" return initTableMixins.methods.pageData.call(this, pageForm) }, openAdd() { diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/statistics/analysis/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/statistics/analysis/index.html index 9aa148f..ada1836 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/statistics/analysis/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/statistics/analysis/index.html @@ -129,7 +129,7 @@ layout("/layouts/platform.html"){ - + 人员属性： { if (res.code === 0) { this.tableData = res.data diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/statistics/comprehensive/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/statistics/comprehensive/index.html index 42c0013..2d9e866 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/statistics/comprehensive/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/statistics/comprehensive/index.html @@ -165,7 +165,8 @@ layout("/layouts/platform.html"){ { prop: "unitName", label: "所属单位", width: 120, sortable: true }, // 临时屏蔽“人员分类”列表字段，不删除配置，后续需要可恢复。 // { prop: "aidFundMemberUserType", label: "人员分类", width: 120, sortable: true }, - { prop: "userAttribute", label: "人员属性", width: 120, sortable: true }, + // 屏蔽人员属性列，同时从导出可选列中排除。 + // { prop: "userAttribute", label: "人员属性", width: 120, sortable: true }, { prop: "idCardType", label: "证件类型", width: 120, sortable: true, checked: 0 }, { prop: "idCard", label: "证件号码", width: 120, sortable: true, checked: 0 }, { prop: "marriage", label: "婚姻状况", width: 120, sortable: true, checked: 0 }, @@ -205,7 +206,9 @@ layout("/layouts/platform.html"){ pageForm.memberTypes = JSON.stringify(this.pageForm.memberTypes) pageForm.personTypes = JSON.stringify(this.pageForm.personTypes) pageForm.aidFundMemberUserTypes = JSON.stringify(this.pageForm.aidFundMemberUserTypes) - pageForm.userAttributes = JSON.stringify(this.pageForm.userAttributes) + // 人员属性已屏蔽，查询和导出均不再按该字段过滤。 + pageForm.userAttribute = "" + pageForm.userAttributes = "[]" pageForm.userStates = JSON.stringify(this.pageForm.userStates) const data = this.tableColumns.filter(item => this.checkedFields.includes(item.prop)).map(item => { return {prop: item.prop, label: item.label} @@ -230,7 +233,9 @@ layout("/layouts/platform.html"){ pageForm.memberTypes = JSON.stringify(this.pageForm.memberTypes) pageForm.personTypes = JSON.stringify(this.pageForm.personTypes) pageForm.aidFundMemberUserTypes = JSON.stringify(this.pageForm.aidFundMemberUserTypes) - pageForm.userAttributes = JSON.stringify(this.pageForm.userAttributes) + // 人员属性已屏蔽，查询和导出均不再按该字段过滤。 + pageForm.userAttribute = "" + pageForm.userAttributes = "[]" pageForm.preparedBys = JSON.stringify(this.pageForm.preparedBys) pageForm.memberStatus = JSON.stringify(this.pageForm.memberStatus) pageForm.userStates = JSON.stringify(this.pageForm.userStates) diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/statistics/comprehensive/queryForm.js b/src/main/resources/views/platform/zhgh/staffmanage/member/statistics/comprehensive/queryForm.js index ec1a83c..04b6524 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/statistics/comprehensive/queryForm.js +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/statistics/comprehensive/queryForm.js @@ -113,7 +113,7 @@ const MEMBER_STATISTICS_COMPREHENSIVE_QUERY_FORM = { - + 人员属性： - + 人员属性： { if (res.code === 0) { this.tableData = res.data