From def325eb00744bae8f3494ddb253fe202ad76520 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期日, 07 四月 2024 18:08:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/system/service/impl/SysDeptServiceImpl.java | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/system/service/impl/SysDeptServiceImpl.java b/ycl-server/src/main/java/com/ycl/system/service/impl/SysDeptServiceImpl.java
index f7a6506..e513424 100644
--- a/ycl-server/src/main/java/com/ycl/system/service/impl/SysDeptServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/system/service/impl/SysDeptServiceImpl.java
@@ -296,6 +296,10 @@
return deptMapper.deleteDeptById(deptId);
}
+ /**
+ * 閮ㄩ棬涓嬫媺鍒楄〃
+ * @return
+ */
@Override
public Result all() {
List<BaseSelect> vos = deptMapper.selectDeptList(new SysDept()).stream().map(sysDept -> {
@@ -307,6 +311,21 @@
).collect(Collectors.toList());
return Result.ok().data(vos);
}
+ /**
+ * 鍖哄煙涓嬫媺鍒楄〃
+ * @return
+ */
+ @Override
+ public Result pullList() {
+ List<BaseSelect> vos = deptMapper.selectDeptList(new SysDept()).stream().filter(sysDept -> sysDept.getArea()!=null).map(sysDept -> {
+ BaseSelect baseSelect = new BaseSelect();
+ baseSelect.setId(Integer.parseInt(sysDept.getDeptId() + ""));
+ baseSelect.setValue(sysDept.getArea());
+ return baseSelect;
+ }
+ ).collect(Collectors.toList());
+ return Result.ok().data(vos);
+ }
/**
* 閫掑綊鍒楄〃
--
Gitblit v1.8.0