diff --git a/db/1schema.sql b/db/1schema.sql index 982376e44..c9fef6a74 100644 --- a/db/1schema.sql +++ b/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; diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysDeptController.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysDeptController.java index 065482f31..b635c5a71 100644 --- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysDeptController.java +++ b/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)); + } + + /** * 添加 * diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/SysDeptService.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/SysDeptService.java index 94ba43d45..c14f20d38 100644 --- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/SysDeptService.java +++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/SysDeptService.java @@ -50,6 +50,8 @@ public interface SysDeptService extends IService { */ List> selectTree(String deptName, Long parentId); + List> selectSimpleTree(String deptName, Long parentId); + /** * 删除部门 * diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysDeptServiceImpl.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysDeptServiceImpl.java index e36155178..ab917719c 100644 --- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysDeptServiceImpl.java +++ b/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 impl return TreeUtil.build(collect, parentId == null ? 0 : parentId); } + @Override + public List> selectSimpleTree(String deptName, Long parentId) { + // 查询全部部门 + List deptAllList = deptMapper + .selectList(Wrappers.lambdaQuery().like(StrUtil.isNotBlank(deptName), SysDept::getName, deptName)); + + List> collect = deptAllList.stream() + .filter(dept -> dept.getDeptId().intValue() != dept.getParentId()) + .sorted(Comparator.comparingInt(SysDept::getSortOrder)) + .map(dept -> { + TreeNode treeNode = new TreeNode<>(); + treeNode.setId(dept.getDeptId()); + treeNode.setParentId(dept.getParentId()); + treeNode.setName(dept.getName()); + return treeNode; + }) + .collect(Collectors.toList()); + + List> build = TreeUtil.build(collect, parentId == null ? 0 : parentId); + + return build; + + } + /** * 导出部门 *