From 709e71bade7497f61b58f332175c9d29074215fb Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 24 五月 2025 17:27:21 +0800
Subject: [PATCH] #
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeviceSiteController.java | 11 +++--------
rsf-admin/src/page/work/components/StaSelect.jsx | 28 ++++++++++++++++++----------
2 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/rsf-admin/src/page/work/components/StaSelect.jsx b/rsf-admin/src/page/work/components/StaSelect.jsx
index 5971aa6..73217b9 100644
--- a/rsf-admin/src/page/work/components/StaSelect.jsx
+++ b/rsf-admin/src/page/work/components/StaSelect.jsx
@@ -29,19 +29,27 @@
const http = async () => {
setLoading(true);
try {
- const res = await request.post('/selectStaList/page', {
- type: type,
- current: page,
- pageSize: perPage
+ const res = await request.post('/selectStaList/list', {
+ type: type
});
if (res?.data?.code === 200) {
- setList(res.data.data.records.map((item) => {
- return {
- id: item.site,
- name: item.site
- }
- }));
+ // 浣跨敤Set鏉ヨ繃婊ら噸澶嶇殑site鍊�
+ const uniqueSites = new Set();
+ setList(res.data.data
+ .filter(item => {
+ if (uniqueSites.has(item.site)) {
+ return false;
+ }
+ uniqueSites.add(item.site);
+ return true;
+ })
+ .map((item) => {
+ return {
+ id: item.site,
+ name: item.site
+ }
+ }));
} else {
notify(res.data.msg);
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeviceSiteController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeviceSiteController.java
index 0dd3457..4770997 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeviceSiteController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeviceSiteController.java
@@ -42,20 +42,15 @@
@PreAuthorize("hasAuthority('manager:deviceSite:list')")
- @PostMapping("/selectStaList/page")
+ @PostMapping("/selectStaList/list")
public R selectStaList(@RequestBody Map<String, Object> map) {
List<String> longs = null;
if (map.get("type") != null) {
longs = JSONArray.parseArray(map.get("type").toString(), String.class);
map.entrySet().removeIf(next -> next.getKey().equals("type"));
}
- BaseParam baseParam = buildParam(map, BaseParam.class);
- PageParam<DeviceSite, BaseParam> pageParam = new PageParam<>(baseParam, DeviceSite.class);
-
- QueryWrapper<DeviceSite> queryWrapper = pageParam.buildWrapper(true);
- queryWrapper.lambda().in(DeviceSite::getType, longs);
- PageParam<DeviceSite, BaseParam> page = deviceSiteService.page(pageParam, queryWrapper);
- return R.ok().add(page );
+ List<DeviceSite> list = deviceSiteService.list(new LambdaQueryWrapper<DeviceSite>().in(DeviceSite::getType, longs));
+ return R.ok().add(list);
}
@PreAuthorize("hasAuthority('manager:deviceSite:list')")
--
Gitblit v1.9.1