From 523365960513f297024a419f94b2b42eccd9456f Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 09 四月 2026 11:21:41 +0800
Subject: [PATCH] #
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CompanysController.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CompanysController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CompanysController.java
index b802114..4ca5de3 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CompanysController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CompanysController.java
@@ -10,10 +10,12 @@
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
+import com.vincent.rsf.server.manager.controller.vo.CompanysOptionVo;
import com.vincent.rsf.server.manager.entity.Companys;
import com.vincent.rsf.server.manager.entity.Warehouse;
import com.vincent.rsf.server.manager.service.CompanysService;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
+import com.vincent.rsf.server.manager.utils.buildPageRowsUtils;
import com.vincent.rsf.server.system.controller.BaseController;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import io.swagger.annotations.Api;
@@ -37,13 +39,21 @@
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<Companys, BaseParam> pageParam = new PageParam<>(baseParam, Companys.class);
- return R.ok().add(companysService.page(pageParam, pageParam.buildWrapper(true)));
+ PageParam<Companys, BaseParam> page = companysService.page(pageParam, pageParam.buildWrapper(true));
+ buildPageRowsUtils.userNameMap(page.getRecords());
+ return R.ok().add(page);
}
@PreAuthorize("hasAuthority('manager:companys:list')")
@PostMapping("/companys/list")
public R list(@RequestBody Map<String, Object> map) {
- return R.ok().add(companysService.list());
+ List<CompanysOptionVo> records = companysService
+ .list(new LambdaQueryWrapper<Companys>()
+ .select(Companys::getId, Companys::getCode, Companys::getName, Companys::getType))
+ .stream()
+ .map(this::buildOptionVo)
+ .toList();
+ return R.ok().add(records);
}
@PreAuthorize("hasAuthority('manager:companys:list')")
@@ -158,4 +168,13 @@
ExcelUtil.build(ExcelUtil.create(companies, Companys.class), response);
}
+ private CompanysOptionVo buildOptionVo(Companys companys) {
+ CompanysOptionVo optionVo = new CompanysOptionVo();
+ optionVo.setId(companys.getId());
+ optionVo.setCode(companys.getCode());
+ optionVo.setName(companys.getName());
+ optionVo.setType(companys.getType());
+ return optionVo;
+ }
+
}
--
Gitblit v1.9.1