order by fix

maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/OrganizationsMapper.java

@@ -16,9 +16,12 @@
  
 
 package org.maxkey.persistence.mapper;
+import java.util.List;
+
 import org.apache.mybatis.jpa.persistence.IJpaBaseMapper;
 import org.maxkey.entity.Organizations;
 
 public interface OrganizationsMapper extends IJpaBaseMapper<Organizations> {
 
+	public List<Organizations> queryOrgs(Organizations organization);
 }

maxkey-persistence/src/main/java/org/maxkey/persistence/service/OrganizationsService.java

@@ -83,6 +83,10 @@ public class OrganizationsService  extends JpaBaseService<Organizations>{
          return false;
      }
  
+	 public List<Organizations> queryOrgs(Organizations organization){
+		 return getMapper().queryOrgs(organization);
+	 }
+	 
 	 public boolean delete(Organizations organization) {
 	     if(super.delete(organization)){
 	    	 kafkaPersistService.send(

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

maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/OrganizationsMapper.xml

@@ -20,14 +20,24 @@
 	
     
     
-     <select id="queryPageResults" parameterType="Organizations" resultType="Organizations">
+     <select id="queryOrgs" parameterType="Organizations" resultType="Organizations">
     	select 
 			*
     	from mxk_organizations 
     	where	1	=	1
     	<include refid="dao_where_statement"/>
+    	order by sortindex
     </select>
     
+    
+   <select id="queryPageResults" parameterType="Organizations" resultType="Organizations">
+    	select 
+			*
+    	from mxk_organizations 
+    	where	1	=	1
+    	<include refid="dao_where_statement"/>
+    	order by sortindex
+    </select>
   
     <update id="logisticDelete" parameterType="Organizations" >
     	update mxk_organizations set status	=	'2'  

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

maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/UserInfoMapper.xml

@@ -68,7 +68,7 @@
 		<if test="departmentId != null and departmentId != ''">
 			and departmentid = #{departmentId}
 		</if>
-		order by sortorder 
+		order by sortorder,id 
 	</select>
 	
     <update id="locked" parameterType="UserInfo" >

maxkey-web-manage/src/main/java/org/maxkey/web/contorller/OrganizationsController.java

@@ -59,7 +59,7 @@ public class OrganizationsController {
   public List<HashMap<String, Object>> organizationsTree(@RequestParam(value = "id", required = false) String id) {
     _logger.debug("organizationsTree id :" + id);
     Organizations queryOrg = new Organizations();
-    List<Organizations> organizationsList = this.organizationsService.query(queryOrg);
+    List<Organizations> organizationsList = this.organizationsService.queryOrgs(queryOrg);
     TreeNodeList treeNodeList = new TreeNodeList();
     
     for (Organizations org : organizationsList) {