From a4112a5d31fa3a66daafdc009ff3b3047bb98f67 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 24 五月 2025 17:14:04 +0800
Subject: [PATCH] #巷道

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 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 33d6939..a96149c 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
@@ -15,6 +15,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.LocStsType;
 import com.vincent.rsf.server.manager.service.LocService;
 import com.vincent.rsf.server.system.controller.BaseController;
 import io.swagger.annotations.Api;
@@ -63,7 +64,11 @@
     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()));
+        List<Loc> list = locService.list(new LambdaQueryWrapper<Loc>()
+                .eq(Loc::getAreaId, loc.getAreaId())
+                .eq(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());
         return R.ok(list1);
     }
@@ -222,6 +227,10 @@
         if (Objects.isNull(param.getEndLev())) {
             return R.error("缁堟灞備笉鑳戒负绌猴紒锛�");
         }
+        if (Objects.isNull(param.getChannel())) {
+            return R.error("宸烽亾涓嶈兘涓虹┖锛侊紒");
+        }
+
         return locService.initLocs(param, getLoginUserId());
     }
 

--
Gitblit v1.9.1