From 6166b702c4cf716302e44cc118bc8e5fc8e909b3 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期四, 25 十二月 2025 16:11:18 +0800
Subject: [PATCH] 问题修复及优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 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 59971b5..bf11e25 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
@@ -60,13 +60,20 @@
}
@PreAuthorize("hasAuthority('manager:loc:list')")
+ @ApiOperation(("鑾峰彇搴撲綅浣跨敤鐜�"))
+ @PostMapping("/loc/pie/list")
+ public R locPie() {
+ return R.ok().add(locService.getLocPies());
+ }
+
+ @PreAuthorize("hasAuthority('manager:loc:list')")
@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);
List<Loc> list = locService.list(new LambdaQueryWrapper<Loc>()
.eq(Loc::getAreaId, loc.getAreaId())
- .eq(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());
@@ -120,10 +127,13 @@
public R update(@RequestBody Loc loc) {
loc.setUpdateBy(getLoginUserId());
String join = StringUtils.join(loc.getTypeIds(), ",");
- loc.setType(join);
- if (Objects.isNull(loc.getTypeIds())) {
- throw new CoolException("搴撲綅绫诲瀷涓嶈兘涓虹┖锛侊紒");
+ if (!Objects.isNull(loc.getTypeIds())) {
+ loc.setType(join);
}
+ if (Objects.isNull(loc.getTypeIds()) && !Objects.isNull(loc.getType())) {
+ loc.setTypeIds(Arrays.asList(Long.valueOf(loc.getType())));
+ }
+
if (!locService.updateById(loc)) {
return R.error("Update Fail");
}
--
Gitblit v1.9.1