|
@@ -2,7 +2,6 @@ package com.fjhx.tenant.controller.tenant;
|
|
|
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
import com.baomidou.dynamic.datasource.annotation.DS;
|
|
import com.baomidou.dynamic.datasource.annotation.DS;
|
|
-import com.ruoyi.common.annotation.Log;
|
|
|
|
import com.ruoyi.common.annotation.TenantIgnore;
|
|
import com.ruoyi.common.annotation.TenantIgnore;
|
|
import com.ruoyi.common.constant.BaseSourceConstant;
|
|
import com.ruoyi.common.constant.BaseSourceConstant;
|
|
import com.ruoyi.common.core.controller.BaseController;
|
|
import com.ruoyi.common.core.controller.BaseController;
|
|
@@ -12,7 +11,6 @@ import com.ruoyi.common.core.domain.entity.SysRole;
|
|
import com.ruoyi.common.core.domain.entity.SysUser;
|
|
import com.ruoyi.common.core.domain.entity.SysUser;
|
|
import com.ruoyi.common.core.domain.model.LoginUser;
|
|
import com.ruoyi.common.core.domain.model.LoginUser;
|
|
import com.ruoyi.common.core.page.TableDataInfo;
|
|
import com.ruoyi.common.core.page.TableDataInfo;
|
|
-import com.ruoyi.common.enums.BusinessType;
|
|
|
|
import com.ruoyi.common.exception.ServiceException;
|
|
import com.ruoyi.common.exception.ServiceException;
|
|
import com.ruoyi.common.utils.SecurityUtils;
|
|
import com.ruoyi.common.utils.SecurityUtils;
|
|
import com.ruoyi.common.utils.StringUtils;
|
|
import com.ruoyi.common.utils.StringUtils;
|
|
@@ -61,7 +59,6 @@ public class RoleTenantController extends BaseController {
|
|
/**
|
|
/**
|
|
* 新增角色
|
|
* 新增角色
|
|
*/
|
|
*/
|
|
- @Log(title = "角色管理", businessType = BusinessType.INSERT)
|
|
|
|
@PostMapping
|
|
@PostMapping
|
|
public void add(@Validated @RequestBody SysRole role) {
|
|
public void add(@Validated @RequestBody SysRole role) {
|
|
String tenantId = role.getTenantId();
|
|
String tenantId = role.getTenantId();
|
|
@@ -80,7 +77,6 @@ public class RoleTenantController extends BaseController {
|
|
/**
|
|
/**
|
|
* 修改保存角色
|
|
* 修改保存角色
|
|
*/
|
|
*/
|
|
- @Log(title = "角色管理", businessType = BusinessType.UPDATE)
|
|
|
|
@PutMapping
|
|
@PutMapping
|
|
public void edit(@Validated @RequestBody SysRole role) {
|
|
public void edit(@Validated @RequestBody SysRole role) {
|
|
String tenantId = role.getTenantId();
|
|
String tenantId = role.getTenantId();
|
|
@@ -116,7 +112,6 @@ public class RoleTenantController extends BaseController {
|
|
/**
|
|
/**
|
|
* 删除角色
|
|
* 删除角色
|
|
*/
|
|
*/
|
|
- @Log(title = "角色管理", businessType = BusinessType.DELETE)
|
|
|
|
@DeleteMapping("/{roleIds}")
|
|
@DeleteMapping("/{roleIds}")
|
|
public void remove(@PathVariable Long[] roleIds) {
|
|
public void remove(@PathVariable Long[] roleIds) {
|
|
roleService.deleteRoleByIds(roleIds);
|
|
roleService.deleteRoleByIds(roleIds);
|