From 735717387e9f1733c9d553b8a7946553c7bfa0a7 Mon Sep 17 00:00:00 2001 From: MaxKey Date: Sat, 31 Jul 2021 12:37:11 +0800 Subject: [PATCH] order by fix --- maxkey-lib/mybatis-jpa-extra-2.4.jar | Bin 81365 -> 81426 bytes .../mapper/OrganizationsMapper.java | 3 +++ .../service/OrganizationsService.java | 4 ++++ .../mapper/xml/mysql/GroupMemberMapper.xml | 2 +- .../mapper/xml/mysql/OrganizationsMapper.xml | 12 +++++++++++- .../mapper/xml/mysql/RoleMemberMapper.xml | 2 +- .../mapper/xml/mysql/UserInfoMapper.xml | 2 +- .../contorller/OrganizationsController.java | 2 +- 8 files changed, 22 insertions(+), 5 deletions(-) diff --git a/maxkey-lib/mybatis-jpa-extra-2.4.jar b/maxkey-lib/mybatis-jpa-extra-2.4.jar index 88c2cc3088bf938977b61eb64e837108d58c6d8f..861344af864eb50ff3e10750a9696cbbd7b25684 100644 GIT binary patch delta 5087 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 { + public List queryOrgs(Organizations organization); } diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/OrganizationsService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/OrganizationsService.java index fd374ede6..16161dfcc 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/OrganizationsService.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/OrganizationsService.java @@ -83,6 +83,10 @@ public class OrganizationsService extends JpaBaseService{ return false; } + public List queryOrgs(Organizations organization){ + return getMapper().queryOrgs(organization); + } + public boolean delete(Organizations organization) { if(super.delete(organization)){ kafkaPersistService.send( diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/GroupMemberMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/GroupMemberMapper.xml index 25e5607ac..4650464bf 100644 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/GroupMemberMapper.xml +++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/GroupMemberMapper.xml @@ -207,7 +207,7 @@ type ) select - concat_ws('-','UD','${id}',u.id) id, + concat('${id}',u.id) id, '${id}' groupid, u.id memberid, 'USER-DYNAMIC' TYPE diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/OrganizationsMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/OrganizationsMapper.xml index 2b6ca69be..c409d1b3e 100644 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/OrganizationsMapper.xml +++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/OrganizationsMapper.xml @@ -20,14 +20,24 @@ - select * from mxk_organizations where 1 = 1 + order by sortindex + + update mxk_organizations set status = '2' diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/RoleMemberMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/RoleMemberMapper.xml index 4b28eb34d..977501fcf 100644 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/RoleMemberMapper.xml +++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/RoleMemberMapper.xml @@ -209,7 +209,7 @@ type ) select - concat_ws('-','UD','${id}',u.id) id, + concat('${id}',u.id) id, '${id}' ROLEID, u.id memberid, 'USER-DYNAMIC' type diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/UserInfoMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/UserInfoMapper.xml index 379c67466..d0750f812 100644 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/UserInfoMapper.xml +++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/UserInfoMapper.xml @@ -68,7 +68,7 @@ and departmentid = #{departmentId} - order by sortorder + order by sortorder,id diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/OrganizationsController.java b/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/OrganizationsController.java index c9fa85d08..199eba283 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/OrganizationsController.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/OrganizationsController.java @@ -59,7 +59,7 @@ public class OrganizationsController { public List> organizationsTree(@RequestParam(value = "id", required = false) String id) { _logger.debug("organizationsTree id :" + id); Organizations queryOrg = new Organizations(); - List organizationsList = this.organizationsService.query(queryOrg); + List organizationsList = this.organizationsService.queryOrgs(queryOrg); TreeNodeList treeNodeList = new TreeNodeList(); for (Organizations org : organizationsList) {