机构树sort为null问题

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/vo/SysOrgVO.java

@@ -29,7 +29,7 @@ public class SysOrgVO {
     private Integer type;
     private String shortName;
     private String treeShowPath;
-    private Integer sort=0;
+    private Integer sort;
     @JsonSerialize(using = ToStringSerializer.class)
     private Long treeShowParentId;
     private List<SysOrgVO> children = new ArrayList<SysOrgVO>();

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysOrgMapper.xml

@@ -629,7 +629,7 @@
                type,
                tree_show_parent_id,
                tree_show_path,
-               sort as sort
+               if(sort is null,0,sort) as sort
         FROM sys_org
         WHERE deleted = 0
         ORDER BY isnull(sort),sort, path