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

guoshilong

2023-04-23 fe3996e9c4f4236d39f8ef468586c31a8a532d55

 skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/service/IDeptService.java

@@ -16,6 +16,8 @@
 */
package cn.gistack.system.service;

import cn.gistack.common.node.DeptUserTreeNode;
import cn.gistack.common.node.TreeNode;
import cn.gistack.system.entity.Dept;
import cn.gistack.system.vo.DeptVO;
import com.baomidou.mybatisplus.extension.service.IService;
@@ -116,4 +118,10 @@
    */
   List<DeptVO> search(String deptName, Long parentId);

   /**
    * 查询组织机构树数据（下级包含人员信息）
    * @param treeNode
    * @return
    */
   List<TreeNode> getDeptAndUserTree(DeptUserTreeNode treeNode);
}