From 40a19e2e23ba1a58a444e5602f8f25d5fdc6ff59 Mon Sep 17 00:00:00 2001
From: luolm <470431449@qq.com>
Date: Sun, 9 Feb 2025 11:39:45 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8-=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/controller/BaseAreaController.java           | 10 ++++++++++
 .../admin/controller/PositionController.java           |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/BaseAreaController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/BaseAreaController.java
index 1807f1d1..d22c17b5 100644
--- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/BaseAreaController.java
+++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/BaseAreaController.java
@@ -126,6 +126,11 @@ public class BaseAreaController extends ControllerBase {
     }
 
 
+    /**
+     * 启用
+     * @param ids
+     * @return
+     */
     @PostMapping("enable")
     @MethodInfoMark(value = "启用" ,menuName = "区域管理")
     @ApiMark(moduleName = "区域管理", apiName = "启用")
@@ -137,6 +142,11 @@ public class BaseAreaController extends ControllerBase {
 
     }
 
+    /**
+     * 禁用
+     * @param ids
+     * @return
+     */
     @PostMapping("disable")
     @MethodInfoMark(value = "禁用" ,menuName = "区域管理")
     @ApiMark(moduleName = "区域管理", apiName = "禁用")
diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/PositionController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/PositionController.java
index a74828d2..9de29ec2 100644
--- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/PositionController.java
+++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/PositionController.java
@@ -78,7 +78,7 @@ public class PositionController extends ControllerBase {
         Map<String, String> positionLanguageMp=new HashMap<>();
         if(StrUtil.isNotBlank(ent.getPositionLanguage())) {
             List<PositionLanguageVO> positionLanguage = JSON.parseArray(ent.getPositionLanguage(), PositionLanguageVO.class);
-            positionLanguageMp = positionLanguage.stream()
+            positionLanguageMp = positionLanguage.stream().filter(u->StrUtil.isNotBlank(u.getLanguageValue()) )
                     .collect(Collectors.toMap(PositionLanguageVO::getCode, PositionLanguageVO::getLanguageValue));
         }
         List<PositionLanguageVO> positionLanguageResult = Convert.toList(PositionLanguageVO.class, allLanguage);