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/LocReviseController.java | 26 +++++++-------------------
1 files changed, 7 insertions(+), 19 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocReviseController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocReviseController.java
index 50e1d61..4ed1ffe 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocReviseController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocReviseController.java
@@ -15,6 +15,7 @@
import com.vincent.rsf.server.manager.service.WarehouseAreasService;
import com.vincent.rsf.server.manager.service.impl.WarehouseAreasServiceImpl;
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;
@@ -22,7 +23,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@Api("搴撳瓨璋冩暣鍗�")
@@ -31,15 +32,16 @@
@Autowired
private LocReviseService locReviseService;
- @Autowired
- private WarehouseAreasService warehouseAreasService;
+
@PreAuthorize("hasAuthority('manager:locRevise:list')")
@PostMapping("/locRevise/page")
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<LocRevise, BaseParam> pageParam = new PageParam<>(baseParam, LocRevise.class);
- return R.ok().add(locReviseService.page(pageParam, pageParam.buildWrapper(true)));
+ PageParam<LocRevise, BaseParam> page = locReviseService.page(pageParam, pageParam.buildWrapper(true));
+ buildPageRowsUtils.userNameMap(page.getRecords());
+ return R.ok().add(page);
}
@PreAuthorize("hasAuthority('manager:locRevise:list')")
@@ -69,21 +71,7 @@
locRevise.setUpdateBy(getLoginUserId());
locRevise.setUpdateTime(new Date());
- if (Objects.isNull(locRevise.getId())) {
- String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LOC_REVISE_CODE, null);
- locRevise.setCode(ruleCode);
- }
-
- WarehouseAreas areas = warehouseAreasService.getById(locRevise.getAreaId());
- if (!Objects.isNull(areas)) {
- locRevise.setAreaId(areas.getId())
- .setAreaName(areas.getName());
- }
-
- if (!locReviseService.save(locRevise)) {
- return R.error("Save Fail");
- }
- return R.ok("Save Success").add(locRevise);
+ return R.ok("Save Success").add(locReviseService.saveRevise(locRevise));
}
@PreAuthorize("hasAuthority('manager:locRevise:update')")
--
Gitblit v1.9.1