|
@@ -7,6 +7,7 @@ import com.alibaba.fastjson2.JSONObject;
|
|
import com.baomidou.dynamic.datasource.annotation.DS;
|
|
import com.baomidou.dynamic.datasource.annotation.DS;
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
import com.fjhx.tenant.utils.DeptUstil;
|
|
import com.fjhx.tenant.utils.DeptUstil;
|
|
|
|
+import com.ruoyi.common.annotation.Log;
|
|
import com.ruoyi.common.annotation.RepeatSubmit;
|
|
import com.ruoyi.common.annotation.RepeatSubmit;
|
|
import com.ruoyi.common.annotation.TenantIgnore;
|
|
import com.ruoyi.common.annotation.TenantIgnore;
|
|
import com.ruoyi.common.constant.BaseSourceConstant;
|
|
import com.ruoyi.common.constant.BaseSourceConstant;
|
|
@@ -20,6 +21,7 @@ import com.ruoyi.common.core.domain.entity.SysUserIdentity;
|
|
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.core.redis.RedisCache;
|
|
import com.ruoyi.common.core.redis.RedisCache;
|
|
|
|
+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;
|
|
@@ -86,6 +88,7 @@ public class UserTenantController extends BaseController {
|
|
/**
|
|
/**
|
|
* 新增用户
|
|
* 新增用户
|
|
*/
|
|
*/
|
|
|
|
+ @Log(title = "用户管理", businessType = BusinessType.INSERT)
|
|
@RepeatSubmit
|
|
@RepeatSubmit
|
|
@PostMapping
|
|
@PostMapping
|
|
public void add(@Validated @RequestBody SysUser user) {
|
|
public void add(@Validated @RequestBody SysUser user) {
|
|
@@ -116,6 +119,7 @@ public class UserTenantController extends BaseController {
|
|
/**
|
|
/**
|
|
* 修改用户
|
|
* 修改用户
|
|
*/
|
|
*/
|
|
|
|
+ @Log(title = "用户管理", businessType = BusinessType.UPDATE)
|
|
@PutMapping
|
|
@PutMapping
|
|
public void edit(@Validated @RequestBody SysUser user) {
|
|
public void edit(@Validated @RequestBody SysUser user) {
|
|
String tenantId = user.getTenantId();
|
|
String tenantId = user.getTenantId();
|
|
@@ -158,6 +162,7 @@ public class UserTenantController extends BaseController {
|
|
/**
|
|
/**
|
|
* 删除用户
|
|
* 删除用户
|
|
*/
|
|
*/
|
|
|
|
+ @Log(title = "用户管理", businessType = BusinessType.DELETE)
|
|
@DeleteMapping("/{userIds}")
|
|
@DeleteMapping("/{userIds}")
|
|
public AjaxResult remove(@PathVariable Long[] userIds) {
|
|
public AjaxResult remove(@PathVariable Long[] userIds) {
|
|
if (ArrayUtils.contains(userIds, getUserId())) {
|
|
if (ArrayUtils.contains(userIds, getUserId())) {
|