部门-调整
This commit is contained in:
parent
f0b44ad060
commit
40a19e2e23
|
|
@ -126,6 +126,11 @@ public class BaseAreaController extends ControllerBase {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 启用
|
||||||
|
* @param ids
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
@PostMapping("enable")
|
@PostMapping("enable")
|
||||||
@MethodInfoMark(value = "启用" ,menuName = "区域管理")
|
@MethodInfoMark(value = "启用" ,menuName = "区域管理")
|
||||||
@ApiMark(moduleName = "区域管理", apiName = "启用")
|
@ApiMark(moduleName = "区域管理", apiName = "启用")
|
||||||
|
|
@ -137,6 +142,11 @@ public class BaseAreaController extends ControllerBase {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 禁用
|
||||||
|
* @param ids
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
@PostMapping("disable")
|
@PostMapping("disable")
|
||||||
@MethodInfoMark(value = "禁用" ,menuName = "区域管理")
|
@MethodInfoMark(value = "禁用" ,menuName = "区域管理")
|
||||||
@ApiMark(moduleName = "区域管理", apiName = "禁用")
|
@ApiMark(moduleName = "区域管理", apiName = "禁用")
|
||||||
|
|
|
||||||
|
|
@ -78,7 +78,7 @@ public class PositionController extends ControllerBase {
|
||||||
Map<String, String> positionLanguageMp=new HashMap<>();
|
Map<String, String> positionLanguageMp=new HashMap<>();
|
||||||
if(StrUtil.isNotBlank(ent.getPositionLanguage())) {
|
if(StrUtil.isNotBlank(ent.getPositionLanguage())) {
|
||||||
List<PositionLanguageVO> positionLanguage = JSON.parseArray(ent.getPositionLanguage(), PositionLanguageVO.class);
|
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));
|
.collect(Collectors.toMap(PositionLanguageVO::getCode, PositionLanguageVO::getLanguageValue));
|
||||||
}
|
}
|
||||||
List<PositionLanguageVO> positionLanguageResult = Convert.toList(PositionLanguageVO.class, allLanguage);
|
List<PositionLanguageVO> positionLanguageResult = Convert.toList(PositionLanguageVO.class, allLanguage);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue