diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/controller/TsPositionController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/controller/TsPositionController.java index f43b10b3..cf26d4df 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/controller/TsPositionController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/controller/TsPositionController.java @@ -51,7 +51,7 @@ public class TsPositionController extends BaseController { @ApiOperation("配置角色") @PostMapping("/role") - public ResponseMessage setRole(@Valid @RequestBody TsPositionRoleVO tsPositionRoleVO){ + public ResponseMessage> setRole(@Valid @RequestBody TsPositionRoleVO tsPositionRoleVO){ return tsPositionService.setRole(tsPositionRoleVO); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/ITsPositionService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/ITsPositionService.java index 87f44d6b..ce5426da 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/ITsPositionService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/ITsPositionService.java @@ -27,10 +27,10 @@ public interface ITsPositionService extends IService { /** * 配置角色 - * @param tsPositionRoleVO:角色ID + * @param tsPositionRoleVO :角色ID * @return ResponseMessage */ - ResponseMessage setRole(TsPositionRoleVO tsPositionRoleVO); + ResponseMessage> setRole(TsPositionRoleVO tsPositionRoleVO); /** * 查询角色 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/impl/TsPositionServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/impl/TsPositionServiceImpl.java index 7665472a..dad3905e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/impl/TsPositionServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/impl/TsPositionServiceImpl.java @@ -14,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.management.relation.Role; import java.util.List; import java.util.Map; @@ -46,12 +47,12 @@ public class TsPositionServiceImpl extends ServiceImpl */ @Override @Transactional - public ResponseMessage setRole(TsPositionRoleVO tsPositionRoleVO) { + public ResponseMessage> setRole(TsPositionRoleVO tsPositionRoleVO) { TsPosition position=tsPositionDao.selectById(tsPositionRoleVO.getPositionId()); if(position==null){ return Result.error("该岗位不存在"); @@ -66,7 +67,8 @@ public class TsPositionServiceImpl extends ServiceImpl roles=getRole(tsPositionRoleVO.getPositionId()); + return Result.success(roles); } /** diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java index a3c855f4..c65cb8fa 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java @@ -73,8 +73,15 @@ public class TsRoleController extends BaseController { } @ApiOperation("配置权限") - @PostMapping("/ment") + @PostMapping("/menu") public ResponseMessage setMenu(@Valid @RequestBody TsRoleMenuVO tsRoleMenuVO){ return tsRoleService.setMenu(tsRoleMenuVO); } + + @ApiOperation("查询角色详情") + @GetMapping("/id") + public ResponseMessage getRoleById(@RequestParam String roleId){ + TsRole tsRole=tsRoleService.getById(roleId); + return Result.success(tsRole); + } }