From 156b9d57a7d0fe6aa76469a1f74fd3e05bfd2afd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=8C=E5=85=88=E8=88=9C?= <2499071264@qq.com> Date: Thu, 10 Sep 2026 11:18:23 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=9A=E5=91=98=E9=AB=98=E7=BA=A7?= =?UTF-8?q?=E7=AE=A1=E7=90=86=20=E6=9F=A5=E8=AF=A2=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E4=B8=8D=E5=90=8C=E9=A1=B5=E5=87=BA=E7=8E=B0=E7=9B=B8=E5=90=8C?= =?UTF-8?q?=E4=BA=BA=E5=91=98-=E5=8A=A0=E4=B8=80=E4=B8=AAid=E6=8E=92?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 32 +++++++++++++++++++ .../service/impl/MemberManageServiceImpl.java | 1 + 2 files changed, 33 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..de71ec4 --- /dev/null +++ b/.gitignore @@ -0,0 +1,32 @@ +# Compiled class file +*.class +*.iml +*.idea +target/ +.idea/compiler.xml +.idea/ +# Log file +*.log + +# BlueJ files +*.ctxt + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + +src/main/resources/application.yaml +src/main/resources/application-dev.yaml +.vscode +bin +node-data-center-mock/ \ No newline at end of file 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 0382835..5006491 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 @@ -109,6 +109,7 @@ public class MemberManageServiceImpl extends BaseServiceImpl implement Cnd cnd = Cnd.NEW(); MemberManagePageForm.buildSearch(cnd, pageForm); cnd.desc("his.changeTime"); + cnd.desc("u.id"); cnd.groupBy("u.id"); if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) {