Merge remote-tracking branch 'origin/dev' into dev

k94314517

2023-09-20 a2735382e853f89465e328dce2df9f3f465bcda9

 server/company/src/main/java/com/doumee/api/system/SystemUserController.java

@@ -104,10 +104,9 @@
    @PostMapping("/page")
    @RequiresPermissions("system:user:query")
    public ApiResponse<PageData<SystemUserListVO>> findPage (@RequestBody PageWrap<QuerySystemUserDTO> pageWrap) {
        pageWrap.getModel().setCompanyId(this.getLoginUser().getCompanyId());
        return ApiResponse.success(systemUserService.findPage(pageWrap));
    }



    @ApiOperation("分页查询系统用户")
    @PostMapping("/findAllList")
@@ -123,7 +122,6 @@
    public ApiResponse findById(@PathVariable Integer id) {
        return ApiResponse.success(systemUserService.findById(id));
    }


    @Trace(withRequestParameters = false)
    @PreventRepeat
@@ -155,7 +153,7 @@
    @RequiresPermissions("system:user:create")
    public ApiResponse companyUpdUser(@Validated(OperaType.Create.class) @RequestBody CreateCompanyUserDTO createCompanyUserDTO) {
        createCompanyUserDTO.setType(Constants.UserType.COMPANY.getKey());
        systemUserBiz.companyCreateUser(createCompanyUserDTO);
        systemUserBiz.companyUpdUser(createCompanyUserDTO);
        return ApiResponse.success(null);
    }

@@ -171,6 +169,16 @@
    }


    @PreventRepeat
    @ApiOperation("修改用户状态")
    @GetMapping("/updUserStatus")
//    @RequiresPermissions("system:user:create")
    public ApiResponse updUserStatus( @RequestParam Integer id,@RequestParam Integer status) {
        systemUserBiz.updUserStatus(id,status);
        return ApiResponse.success(null);
    }


    @Trace(withRequestParameters = false)
    @PreventRepeat
    @ApiOperation("修改密码")