diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberManageServiceImpl.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberManageServiceImpl.java index 6ce6734a..545a9d19 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberManageServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberManageServiceImpl.java @@ -98,8 +98,9 @@ public class MemberManageServiceImpl extends BaseServiceImpl implement u.userAttribute, u.aidFundMemberUserType, u.arrivalAtSchoolDate, - his.id hisId, - his.changeTypes, + -- 无历史记录时保留人员,使用空标识和空类型集合,时间保留 NULL。 + COALESCE(his.id, '') hisId, + COALESCE(his.changeTypes, '[]') changeTypes, his.changeTime FROM vw_user u diff --git a/src/main/resources/views/platform/sys/union/branchUnionGroupManage.js b/src/main/resources/views/platform/sys/union/branchUnionGroupManage.js index 1e289846..a9353d5e 100644 --- a/src/main/resources/views/platform/sys/union/branchUnionGroupManage.js +++ b/src/main/resources/views/platform/sys/union/branchUnionGroupManage.js @@ -40,7 +40,7 @@ const branchUnionGroupManage = { + :close-on-click-modal="false" @close="clearUserOptions"> { - if (res.code === 0) { + if (res.code === 0 && this.dialogFormVisible && requestId === this.userOptionsRequestId) { this.userOptions = res.data } }) 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 e4d137c9..af0f1595 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 @@ -170,6 +170,7 @@ layout("/layouts/platform.html"){ + @@ -649,17 +650,16 @@ layout("/layouts/platform.html"){ } }, getChangeTypes(changeTypes){ - if (!changeTypes) return null - const changeTypesList = JSON.parse(changeTypes) - if (changeTypesList) { - if (!changeTypesList || changeTypesList.length === 0 || !this.changeTypeData || this.changeTypeData.length === 0) return null - return changeTypesList - .map((v) => { - return this.changeTypeData.find((item) => item.code === v).changeTypeName - }) - .join(",") - } - return null + if (!changeTypes) return '--' + const changeTypesList = Array.isArray(changeTypes) ? changeTypes : JSON.parse(changeTypes) + if (!Array.isArray(changeTypesList) || changeTypesList.length === 0) return '--' + // 历史编码可能已不在当前枚举中,保留原编码,避免整张表格渲染中断。 + return changeTypesList + .map((v) => { + const changeType = (this.changeTypeData || []).find((item) => item.code === v) + return changeType ? changeType.changeTypeName : (v || '未知异动类型') + }) + .join(",") }, changeDateRangeChange(val) { if (val && val.length > 0) {