From 6c3cc6842009f3897c3fb18bef8a6634fe653818 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期三, 04 三月 2026 19:59:11 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java
index 5cf638c..50a04a3 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java
@@ -13,6 +13,7 @@
import com.vincent.rsf.server.manager.controller.params.LocMastInitParam;
import com.vincent.rsf.server.manager.controller.params.LocModifyParams;
import com.vincent.rsf.server.manager.entity.Loc;
+import com.vincent.rsf.server.manager.enums.CommonStatus;
import com.vincent.rsf.server.manager.enums.LocStsType;
import com.vincent.rsf.server.manager.service.LocService;
import com.vincent.rsf.server.system.controller.BaseController;
@@ -66,10 +67,11 @@
@PostMapping("/loc/areaNoUse/list")
public R areaNoUselist(@RequestBody Map<String, Object> map) {
String locCode = map.get("locCode").toString();
- Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, locCode),false);
+ Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, locCode)
+ .last("LIMIT 1"));
List<Loc> list = locService.list(new LambdaQueryWrapper<Loc>()
.eq(Loc::getAreaId, loc.getAreaId())
- .eq(!Objects.isNull(loc.getChannel()), Loc::getChannel,loc.getChannel())
+// .eq(!Objects.isNull(loc.getChannel()), Loc::getChannel,loc.getChannel())//
.eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type)
);
List<String> list1 = list.stream().map(obj -> obj.getCode()).collect(Collectors.toList());
@@ -130,6 +132,10 @@
loc.setTypeIds(Arrays.asList(Long.valueOf(loc.getType())));
}
+ if (loc.getStatus().equals(CommonStatus.COMMONSTATUS_NO.val)) {
+ loc.setUseStatus(LocStsType.LOC_STS_TYPE_X.type);
+ }
+
if (!locService.updateById(loc)) {
return R.error("Update Fail");
}
--
Gitblit v1.9.1