fetch:资源修改

adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java

@@ -52,7 +52,7 @@ public class TsRoleController extends BaseController<TsRole> {
 
     @ApiOperation("新增角色")
     @PostMapping
-    public ResponseMessage<Object> addRole(@Validated(TsRole.insert.class) TsRole tsRole){
+    public ResponseMessage<Object> addRole(@Validated(TsRole.insert.class) @RequestBody TsRole tsRole){
         //设置操作人
         UserEO userEO=UserUtils.getUser();
         tsRole.setOperator(userEO.getUname());
@@ -61,10 +61,11 @@ public class TsRoleController extends BaseController<TsRole> {
 
     @ApiOperation("编辑角色")
     @PutMapping
-    public ResponseMessage<Object> updateRole(@Validated(TsRole.update.class) TsRole tsRole){
+    public ResponseMessage<Object> updateRole(@Validated(TsRole.update.class)@RequestBody TsRole tsRole){
         //设置操作人
         UserEO userEO=UserUtils.getUser();
         tsRole.setOperator(userEO.getUname());
+        System.out.println(tsRole);
         return tsRoleService.updateRole(tsRole);
     }
 
@@ -84,6 +85,10 @@ public class TsRoleController extends BaseController<TsRole> {
     @GetMapping("/id")
     public ResponseMessage<TsRole> getRoleById(@RequestParam String roleId){
         TsRole tsRole=tsRoleService.getById(roleId);
+        if(tsRole.getParentId()!=null){
+            TsRole parent=tsRoleService.getById(tsRole.getParentId());
+            tsRole.setParent(parent.getName());
+        }
         return Result.success(tsRole);
     }
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/entity/TsRole.java

@@ -119,5 +119,9 @@ public class TsRole extends BaseEntity {
     @TableField(exist = false)
     private List<TsRole> children;
 
+    @ApiModelProperty("父节点名称")
+    @TableField(exist = false)
+    private String parent;
+
 
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java

@@ -115,7 +115,7 @@ public class TsRoleServiceImpl extends ServiceImpl<TsRoleDao, TsRole> implements
      */
     @Override
     public ResponseMessage<Object> updateRole(TsRole tsRole) {
-        TsRole oldRole=tsRoleDao.selectById(tsRole.getParentId());
+        TsRole oldRole=tsRoleDao.selectById(tsRole.getId());
         if(oldRole==null){
             return Result.error("该角色不存在");
         }