Merge remote-tracking branch 'origin/master'

jiangping

2024-11-12 41b5c29f4d3653402b99af7e370bd345e961efdd

 server/system_service/src/main/java/com/doumee/api/cloud/SystemUserCloudController.java

@@ -45,7 +45,8 @@
    @ApiOperation("配置用户角色")
    @PostMapping("/createUserRole")
    @CloudRequiredPermission("system:user:createUserRole")
    public ApiResponse createUserRole (@Validated @RequestBody CreateUserRoleDTO dto) {
    public ApiResponse createUserRole (@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@Validated @RequestBody CreateUserRoleDTO dto) {
        dto.setCreateUser(this.getLoginUser(token).getId());
        systemUserBiz.createUserRole(dto);
        return ApiResponse.success(null);
    }
@@ -55,8 +56,8 @@
    @ApiOperation("重置用户密码")
    @PostMapping("/resetPwd")
    @CloudRequiredPermission("system:user:resetPwd")
    public ApiResponse resetPwd (@Validated @RequestBody ResetSystemUserPwdDTO dto) {
        dto.setOperaUserId(this.getLoginUser().getId());
    public ApiResponse resetPwd (@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@Validated @RequestBody ResetSystemUserPwdDTO dto) {
        dto.setOperaUserId(this.getLoginUser(token).getId());
        systemUserBiz.resetPwd(dto);
        return ApiResponse.success(null);
    }
@@ -66,8 +67,8 @@
    @ApiOperation("新建")
    @PostMapping("/create")
    @CloudRequiredPermission("system:user:create")
    public ApiResponse create(@Validated(OperaType.Create.class) @RequestBody CreateSystemUserDTO systemUser) {
        systemUser.setCreateUser(this.getLoginUser().getId());
    public ApiResponse create(@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@Validated(OperaType.Create.class) @RequestBody CreateSystemUserDTO systemUser) {
        systemUser.setCreateUser(this.getLoginUser(token).getId());
        systemUserBiz.create(systemUser);
        return ApiResponse.success(null);
    }
@@ -97,8 +98,8 @@
    @ApiOperation("修改")
    @PostMapping("/updateById")
    @CloudRequiredPermission("system:user:update")
    public ApiResponse updateById( @RequestBody CreateSystemUserDTO systemUser) {
        systemUser.setUpdateUser(this.getLoginUser().getId());
    public ApiResponse updateById(@RequestHeader(Constants.HEADER_USER_TOKEN) String token, @RequestBody CreateSystemUserDTO systemUser) {
        systemUser.setUpdateUser(this.getLoginUser(token).getId());
        systemUserBiz.updateById(systemUser);
        return ApiResponse.success(null);
    }
@@ -111,9 +112,6 @@
    }





    @ApiOperation("查询所有系统用户")
    @PostMapping("/findAllList")
    @CloudRequiredPermission("system:user:query")
@@ -121,6 +119,12 @@
        return ApiResponse.success(systemUserService.findAllList(pageWrap));
    }

    @ApiOperation("查询所有内部人员用户")
    @PostMapping("/findInternalList")
    @CloudRequiredPermission("system:user:query")
    public ApiResponse<List<SystemUser>> findInternalList () {
        return ApiResponse.success(systemUserService.findInternalList());
    }

    @ApiOperation("根据ID查询")
    @GetMapping("/{id}")