From 26a5022c03a63ab8b277c59a38b2e0d2d5c0356f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E8=82=96=E4=BA=91?= <2816048001@qq.com>
Date: Mon, 28 Jun 2021 13:56:19 +0800
Subject: [PATCH] =?UTF-8?q?fetch:=E6=96=B0=E5=A2=9E=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E8=A7=92=E8=89=B2=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sarPosition/controller/TsPositionController.java     | 2 +-
 .../da/slrs/sarPosition/service/ITsPositionService.java  | 4 ++--
 .../sarPosition/service/impl/TsPositionServiceImpl.java  | 8 +++++---
 .../adc/da/slrs/sarRole/controller/TsRoleController.java | 9 ++++++++-
 4 files changed, 16 insertions(+), 7 deletions(-)

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<TsPosition> {
 
     @ApiOperation("配置角色")
     @PostMapping("/role")
-    public ResponseMessage<Object> setRole(@Valid @RequestBody TsPositionRoleVO tsPositionRoleVO){
+    public ResponseMessage<List<TsRole>> 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<TsPosition> {
 
     /**
      * 配置角色
-     * @param tsPositionRoleVO：角色ID
+     * @param tsPositionRoleVO ：角色ID
      * @return ResponseMessage<Object>
      */
-    ResponseMessage<Object> setRole(TsPositionRoleVO tsPositionRoleVO);
+    ResponseMessage<List<TsRole>> 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<TsPositionDao, TsPosition
 
     /**
      * 配置角色
-     * @param tsPositionRoleVO：角色ID
+     * @param tsPositionRoleVO ：角色ID
      * @return ResponseMessage<Object>
      */
     @Override
     @Transactional
-    public ResponseMessage<Object> setRole(TsPositionRoleVO tsPositionRoleVO) {
+    public ResponseMessage<List<TsRole>> setRole(TsPositionRoleVO tsPositionRoleVO) {
         TsPosition position=tsPositionDao.selectById(tsPositionRoleVO.getPositionId());
         if(position==null){
             return Result.error("该岗位不存在");
@@ -66,7 +67,8 @@ public class TsPositionServiceImpl extends ServiceImpl<TsPositionDao, TsPosition
         for(String id:deleteIds){
             tsPositionDao.deleteRole(tsPositionRoleVO.getPositionId(),id);
         }
-        return Result.success();
+        List<TsRole> 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<TsRole> {
     }
 
     @ApiOperation("配置权限")
-    @PostMapping("/ment")
+    @PostMapping("/menu")
     public ResponseMessage<Object> setMenu(@Valid @RequestBody TsRoleMenuVO tsRoleMenuVO){
         return tsRoleService.setMenu(tsRoleMenuVO);
     }
+
+    @ApiOperation("查询角色详情")
+    @GetMapping("/id")
+    public ResponseMessage<TsRole> getRoleById(@RequestParam String roleId){
+        TsRole tsRole=tsRoleService.getById(roleId);
+        return Result.success(tsRole);
+    }
 }