浏览代码

岗位管理

24282 2 年之前
父节点
当前提交
83fb923966

+ 0 - 6
hx-tenant/src/main/java/com/fjhx/tenant/controller/tenant/DetpTenantController.java

@@ -2,12 +2,10 @@ 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.constant.UserConstants;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.entity.SysDept;
-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;
@@ -38,7 +36,6 @@ public class DetpTenantController {
     /**
     /**
      * 新增部门
      * 新增部门
      */
      */
-    @Log(title = "部门管理", businessType = BusinessType.INSERT)
     @PostMapping
     @PostMapping
     public void add(@Validated @RequestBody SysDept dept) {
     public void add(@Validated @RequestBody SysDept dept) {
         String tenantId = dept.getTenantId();
         String tenantId = dept.getTenantId();
@@ -56,7 +53,6 @@ public class DetpTenantController {
     /**
     /**
      * 修改部门
      * 修改部门
      */
      */
-    @Log(title = "部门管理", businessType = BusinessType.UPDATE)
     @PutMapping
     @PutMapping
     public void edit(@Validated @RequestBody SysDept dept) {
     public void edit(@Validated @RequestBody SysDept dept) {
         String tenantId = dept.getTenantId();
         String tenantId = dept.getTenantId();
@@ -80,7 +76,6 @@ public class DetpTenantController {
     /**
     /**
      * 删除部门
      * 删除部门
      */
      */
-    @Log(title = "部门管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{deptId}")
     @DeleteMapping("/{deptId}")
     public void remove(@PathVariable Long deptId) {
     public void remove(@PathVariable Long deptId) {
         if (deptService.hasChildByDeptId(deptId)) {
         if (deptService.hasChildByDeptId(deptId)) {
@@ -93,5 +88,4 @@ public class DetpTenantController {
         deptService.deleteDeptById(deptId);
         deptService.deleteDeptById(deptId);
     }
     }
 
 
-
 }
 }

+ 0 - 5
hx-tenant/src/main/java/com/fjhx/tenant/controller/tenant/RoleTenantController.java

@@ -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);

+ 0 - 4
hx-tenant/src/main/java/com/fjhx/tenant/controller/tenant/UserTenantController.java

@@ -43,7 +43,6 @@ 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) {
@@ -63,7 +62,6 @@ 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();
@@ -83,7 +81,6 @@ 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())) {
@@ -95,7 +92,6 @@ public class UserTenantController extends BaseController {
     /**
     /**
      * 重置密码
      * 重置密码
      */
      */
-    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping("/resetPwd")
     @PutMapping("/resetPwd")
     public void resetPwd(@RequestBody SysUser user) {
     public void resetPwd(@RequestBody SysUser user) {
         userService.checkUserAllowed(user);
         userService.checkUserAllowed(user);