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 implements @Override public List 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 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 """);