#

zjj

1 天以前 709e71bade7497f61b58f332175c9d29074215fb

#

 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);
            }

 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')")