修改

“djh”

2 days ago aad364bb323a1eaa0389ee5c6389bdc0ea7ed526

 hazmat-admin/src/main/java/com/gkhy/hazmat/admin/controller/system/SysUserController.java

@@ -18,7 +18,9 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -42,7 +44,7 @@

  //  @PreAuthorize("hasAuthority('hazmat:manage:company')")
 //   @PreAuthorize("hasAnyAuthority('hazmat:manage:system','hazmat:manage:company')")
//    @PreAuthorize("hasAnyAuthority('hazmat:manage:system','hazmat:manage:company')")
    @PreAuthorize("hasAnyAuthority('hazmat:manage:system','hazmat:manage:company','hazmat:manage:common')")
    @ApiOperation(value = "用户列表(分页)")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "query", name = "pageNum", dataType = "int", required = false, value = "当前页,默认1"),
@@ -61,7 +63,7 @@
        return success(sysUserService.selectUserById(userId));
    }

//    @PreAuthorize("hasAnyAuthority('hazmat:manage:system','hazmat:manage:company')")
    @PreAuthorize("hasAnyAuthority('hazmat:manage:system','hazmat:manage:company')")
    @RepeatSubmit
    @Log(title = "用户管理", businessType = BusinessType.INSERT)
    @ApiOperation(value = "新增用户")
@@ -70,7 +72,7 @@
        return success(sysUserService.addUser(user));
    }

//    @PreAuthorize("hasAnyAuthority('hazmat:manage:system','hazmat:manage:company','hazmat:manage:common')")
    @PreAuthorize("hasAnyAuthority('hazmat:manage:system','hazmat:manage:company','hazmat:manage:common')")
    @RepeatSubmit
    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
    @ApiOperation(value = "编辑用户")
@@ -79,7 +81,7 @@
        return success(sysUserService.updateUser(user));
    }

//    @PreAuthorize("hasAnyAuthority('hazmat:manage:system','hazmat:manage:company')")
    @PreAuthorize("hasAnyAuthority('hazmat:manage:system','hazmat:manage:company')")
    @RepeatSubmit
    @Log(title = "用户管理", businessType = BusinessType.DELETE)
    @ApiOperation(value = "删除用户")
@@ -88,7 +90,7 @@
        return success(sysUserService.deleteUserById(userId));
    }

//    @PreAuthorize("hasAnyAuthority('hazmat:manage:system','hazmat:manage:company','hazmat:manage:common')")
    @PreAuthorize("hasAnyAuthority('hazmat:manage:system','hazmat:manage:company','hazmat:manage:common')")
    @RepeatSubmit
    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
    @ApiOperation(value = "重置密码")
@@ -98,7 +100,7 @@
        return success();
    }

//    @PreAuthorize("hasAnyAuthority('hazmat:manage:system','hazmat:manage:company')")
    @PreAuthorize("hasAnyAuthority('hazmat:manage:system','hazmat:manage:company')")
    @RepeatSubmit
    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
    @ApiOperation(value = "修改用户状态")
@@ -147,4 +149,15 @@
        return success(deptService.selectDeptTreeList(dept));
    }

    @RepeatSubmit
    @Log(title = "用户管理", businessType = BusinessType.IMPORT)
    @ApiOperation(value = "用户Excel批量导入")
    @PostMapping("/importExcel")
    public CommonResult importExcel(MultipartFile file) throws IOException {
        return CommonResult.success(sysUserService.importUserExcel(file));
    }




}