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 positionLanguageMp=new HashMap<>(); if(StrUtil.isNotBlank(ent.getPositionLanguage())) { List 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 positionLanguageResult = Convert.toList(PositionLanguageVO.class, allLanguage);