From 75045b3544cc82ec21b8e20504a63a157e21f46b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A8=8B=E8=AF=9A?= <cc1009578407@qq.com>
Date: Mon, 26 Oct 2026 07:49:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=B7=A5=E4=BC=9A=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=90=9C=E7=B4=A2=E4=BA=BA=E5=91=98=E7=BC=93?=
 =?UTF-8?q?=E5=AD=98=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D=EF=BC=9B=E4=BC=9A?=
 =?UTF-8?q?=E5=91=98=E5=8F=98=E6=9B=B4=E6=9F=A5=E8=AF=A2=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BA=8F=E5=8F=B7=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/MemberManageServiceImpl.java |  5 +++--
 .../sys/union/branchUnionGroupManage.js       | 13 +++++++++--
 .../member/change/manage/index.html           | 22 +++++++++----------
 3 files changed, 25 insertions(+), 15 deletions(-)

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<Sys_user> 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 = {
             </el-card>
 
             <el-dialog :title="formData.id ? '编辑' : '新增'" :visible.sync="dialogFormVisible" width="600px"
-                       :close-on-click-modal="false">
+                       :close-on-click-modal="false" @close="clearUserOptions">
                 <el-form ref="formRef" :model="formData" :rules="rules" label-width="100px">
                     <el-form-item label="小组编码" prop="code">
                         <el-input v-model="formData.code" placeholder="小组编码" maxlength="10"
@@ -103,6 +103,7 @@ const branchUnionGroupManage = {
                 unitIds: [{ required: true, message: "请选择组成单位", trigger: "change" }],
             },
             userOptions: [],
+            userOptionsRequestId: 0,
             units: [],
         }
     },
@@ -173,13 +174,21 @@ const branchUnionGroupManage = {
             })
         },
 
+        clearUserOptions() {
+            this.userOptions = []
+            // 关闭后使未完成的搜索失效，防止旧结果回填到下一次打开的弹窗。
+            this.userOptionsRequestId++
+        },
+
         getUserOptions(keyword, userIds = null) {
+            if (!this.dialogFormVisible && !userIds) return
+            const requestId = ++this.userOptionsRequestId
             $.get("/platform/sys/unionGroup/listUser", {
                 keyword,
                 unionId: this.union_id,
                 userIds: JSON.stringify(userIds)
             }).then((res) => {
-                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"){
 				    <el-table-column align="center" header-align="center" label="更新时间"
 				                     min-width="145px" prop="changeTime"
 				                     show-overflow-tooltip sortable>
+					    <template scope="{row}">{{row.changeTime || '--'}}</template>
 				    </el-table-column>
 				    <el-table-column align="center" header-align="center" label="异动类型"
 				                     prop="changeType" show-overflow-tooltip sortable>
@@ -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) {