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())) {