From fde57f16301a84e4dd94ad4d254073cdf327cfad Mon Sep 17 00:00:00 2001
From: = <=>
Date: Thu, 20 Mar 2025 17:31:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86=E5=B7=A5?=
 =?UTF-8?q?=E5=85=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../member/service/impl/MemberCommonServiceImpl.java        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/v/nutz/zhgh/staffmanage/member/service/impl/MemberCommonServiceImpl.java b/src/main/java/io/v/nutz/zhgh/staffmanage/member/service/impl/MemberCommonServiceImpl.java
index 19d1976..8f09b23 100644
--- a/src/main/java/io/v/nutz/zhgh/staffmanage/member/service/impl/MemberCommonServiceImpl.java
+++ b/src/main/java/io/v/nutz/zhgh/staffmanage/member/service/impl/MemberCommonServiceImpl.java
@@ -78,7 +78,7 @@ public class MemberCommonServiceImpl extends ViServiceImpl<Sys_user> implements
     @Override
     public List<NutMap> memberChangeRecords(String userId) {
         Sql sql = Sqls.create(MEMBER_CHANGE_RECORDS);
-        sql.setCondition(Cnd.where("mcr.userId", "=", userId).desc("mcr.applyTime"));
+        sql.setCondition(Cnd.where("mcr.userId", "=", userId).desc("mcr.applyDateTime"));
         return listMap(sql);
     }
 
@@ -110,13 +110,13 @@ public class MemberCommonServiceImpl extends ViServiceImpl<Sys_user> implements
                 	his.lastHistoryId,
                 	u.unitname,
                 	u.unionname,
-                	mcr.stateId,
+                	mcr.applyStateId,
                 	state.stateName,
                 	state.stateColor
                 FROM
                 	`user_history` his
                 	LEFT JOIN member_change_record mcr ON mcr.id = his.memberChangeRecordId
-                    LEFT JOIN audit_state state ON mcr.stateId = state.stateId
+                    LEFT JOIN audit_state state ON mcr.applyStateId = state.stateId
                     LEFT JOIN `user` u ON u.loginname = his.loginname
                 $condition
                 """);