主分支部门接口

db/1schema.sql

@@ -33,6 +33,6 @@ create database `pjcloudx_thirdparty` default character set utf8mb4 collate utf8
 create database `pjcloudx_canteen` default character set utf8mb4 collate utf8mb4_general_ci;
 create database `pjcloudx_erp` default character set utf8mb4 collate utf8mb4_general_ci;
 create database `pjcloudx_supermarket` default character set utf8mb4 collate utf8mb4_general_ci;
-create database `pjcloudx_supermarket_erp` default character set utf8mb4 collate utf8mb4_general_ci;
+create database `pjcloudx_integrated` default character set utf8mb4 collate utf8mb4_general_ci;
 create database `pjcloudx_wallet` default character set utf8mb4 collate utf8mb4_general_ci;
 create database `pjcloudx_hardware` default character set utf8mb4 collate utf8mb4_general_ci;

pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysDeptController.java

@@ -91,6 +91,21 @@ public class SysDeptController {
         return R.ok(sysDeptService.selectTree(deptName, parentId));
     }
 
+
+    /**
+     *
+     * 查询所有，无权限过滤
+     * simpleTree
+     * @param deptName
+     * @param parentId
+     * @return
+     */
+    @GetMapping(value = "/simpleTree")
+    public R getSimpleTree(String deptName, Long parentId) {
+        return R.ok(sysDeptService.selectSimpleTree(deptName, parentId));
+    }
+
+
     /**
      * 添加
      *

pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/SysDeptService.java

@@ -50,6 +50,8 @@ public interface SysDeptService extends IService<SysDept> {
      */
     List<Tree<Long>> selectTree(String deptName, Long parentId);
 
+    List<Tree<Long>> selectSimpleTree(String deptName, Long parentId);
+
     /**
      * 删除部门
      *

pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysDeptServiceImpl.java

@@ -177,6 +177,30 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
         return TreeUtil.build(collect, parentId == null ? 0 : parentId);
     }
 
+    @Override
+    public List<Tree<Long>> selectSimpleTree(String deptName, Long parentId) {
+        // 查询全部部门
+        List<SysDept> deptAllList = deptMapper
+                .selectList(Wrappers.<SysDept>lambdaQuery().like(StrUtil.isNotBlank(deptName), SysDept::getName, deptName));
+
+        List<TreeNode<Long>> collect = deptAllList.stream()
+                .filter(dept -> dept.getDeptId().intValue() != dept.getParentId())
+                .sorted(Comparator.comparingInt(SysDept::getSortOrder))
+                .map(dept -> {
+                    TreeNode<Long> treeNode = new TreeNode<>();
+                    treeNode.setId(dept.getDeptId());
+                    treeNode.setParentId(dept.getParentId());
+                    treeNode.setName(dept.getName());
+                    return treeNode;
+                })
+                .collect(Collectors.toList());
+
+        List<Tree<Long>> build = TreeUtil.build(collect, parentId == null ? 0 : parentId);
+
+        return build;
+
+    }
+
     /**
      * 导出部门
      *