Merge remote-tracking branch 'origin/jtdev' into jtdev

shenyijian

2024-06-14 417c4a4ebef70bbcad064d284233d2b5fa71ebef

 skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/mapper/DeptMapper.java

@@ -52,6 +52,8 @@
    */
   List<DeptVO> tree(String tenantId);

   List<DeptVO> treeByParentId(String parentId);

   /**
    * 懒加载获取树形节点
    *
@@ -92,4 +94,6 @@
    */
   @MapKey(value = "id")
   Map<String, DeptUserTreeNode> getUserMap(@Param("treeNode") DeptUserTreeNode treeNode);

    String getResDept(@Param("deptIds") String deptIds);
}