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 2397b36f..96d603be 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 @@ -51,7 +51,6 @@ public class PositionController extends ControllerBase { /** * 获取职位列表 - * * @param query * @return */ @@ -59,13 +58,11 @@ public class PositionController extends ControllerBase { @ApiMark(moduleName = "职位管理", apiName = "获取职位列表") public ApiResult> getList(@RequestBody PositionQuery query) { Page result = positionService.getList(new Page<>(query.getPage(), query.getPageSize()), query); - return ApiResult.success(result.getRecords(), query, result.getTotal()); } /** * 获取明细 - * * @param id * @return */ @@ -74,7 +71,6 @@ public class PositionController extends ControllerBase { public ApiResult getPositionDetail(@RequestParam("id") Integer id) { TBasePosition ent = positionService.getById(id); VUtils.trueThrow(null == ent).throwMessage(STATE.ParamErr, "职位不存在"); - PositionDetailVO result = Convert.convert(PositionDetailVO.class, ent); List allLanguage = languageService.lambdaQuery().eq(Language::getEnable, true).list(); Map positionLanguageMp=new HashMap<>(); @@ -101,11 +97,9 @@ public class PositionController extends ControllerBase { @ApiMark(moduleName = "职位管理", apiName = "获取语言列表-新增时调用") public ApiResult > getLanguage() { List allLanguage = languageService.lambdaQuery().eq(Language::getEnable, true).list(); - return ApiResult.success(Convert.toList(PositionLanguageVO.class,allLanguage)); } - @PostMapping("add") @MethodInfoMark(value = "新增", menuName = "职位管理") @ApiMark(moduleName = "职位管理", apiName = "新增") diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITBasePositionService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITBasePositionService.java index c69111bb..52108461 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITBasePositionService.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITBasePositionService.java @@ -25,4 +25,6 @@ public interface ITBasePositionService extends IService { void delByIds(@Param("ids") List ids); List getSimpleTitles(Integer type); + + TBasePosition getWithLanguage(Integer titleId, String language); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AdminUserServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AdminUserServiceImpl.java index 71c29760..9230599e 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AdminUserServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AdminUserServiceImpl.java @@ -383,7 +383,7 @@ public class AdminUserServiceImpl extends ServiceImpl impl @Override public AppUserVO getInfo(Integer userId) { - return baseMapper.getInfo(userId); + AppUserVO vo = baseMapper.getInfo(userId); + if (Objects.nonNull(vo.getTitleId())) { + TBasePosition title = positionService.getWithLanguage(vo.getTitleId(), MultilingualUtil.getLanguage()); + vo.setTitle(title.getPositionName()); + } + return vo; } @Override diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TBasePositionServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TBasePositionServiceImpl.java index d294fa8e..8a1a849c 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TBasePositionServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TBasePositionServiceImpl.java @@ -1,23 +1,28 @@ package com.nflg.mobilebroken.repository.service.impl; +import cn.hutool.core.util.StrUtil; +import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.nflg.mobilebroken.common.constant.Constant; import com.nflg.mobilebroken.common.pojo.query.PageBaseQuery; +import com.nflg.mobilebroken.common.pojo.vo.PositionLanguageVO; import com.nflg.mobilebroken.common.pojo.vo.TitleSimpleVO; import com.nflg.mobilebroken.repository.entity.TBasePosition; import com.nflg.mobilebroken.repository.mapper.TBasePositionMapper; import com.nflg.mobilebroken.repository.service.ITBasePositionService; import org.apache.ibatis.annotations.Param; +import org.springframework.boot.autoconfigure.amqp.RabbitProperties; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Objects; import java.util.stream.Collectors; /** *

* 职位管理 服务实现类 *

- * * @author 代码生成器生成 * @since 2025 */ @@ -25,13 +30,13 @@ import java.util.stream.Collectors; public class TBasePositionServiceImpl extends ServiceImpl implements ITBasePositionService { - public Page getList(@Param("page")Page page, @Param("query") PageBaseQuery query){ - return this.getBaseMapper().getList(page,query); - } + public Page getList(@Param("page") Page page, @Param("query") PageBaseQuery query) { + return this.getBaseMapper().getList(page, query); + } - public void delByIds(@Param("ids") List ids){ - this.getBaseMapper().delByIds(ids); - } + public void delByIds(@Param("ids") List ids) { + this.getBaseMapper().delByIds(ids); + } @Override public List getSimpleTitles(Integer type) { @@ -43,4 +48,23 @@ public class TBasePositionServiceImpl extends ServiceImpl new TitleSimpleVO().setId(d.getId()).setName(d.getPositionName()).setPositionLanguage(d.getPositionLanguage())) .collect(Collectors.toList()); } + + @Override + public TBasePosition getWithLanguage(Integer titleId, String language) { + TBasePosition position = getById(titleId); + if (Objects.isNull(position)) { + return null; + } + if (!StrUtil.equals(Constant.DEFAULT_LANGUAGE_CODE, language)) { + List languageVOS = JSONUtil.toList(position.getPositionLanguage(), PositionLanguageVO.class); + position.setPositionName( + languageVOS.stream() + .filter(l -> StrUtil.equals(l.getCode(), language)) + .findFirst() + .map(PositionLanguageVO::getLanguageValue) + .orElse("") + ); + } + return position; + } }