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

jiangping

2024-12-27 5506edbe54883b31db3cc8e4a1d9d0795a18a3c9

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

@@ -8,6 +8,8 @@
import com.doumee.core.constants.OperaType;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.system.dto.CreateSystemUserDTO;
import com.doumee.dao.system.dto.CreateUserRoleDTO;
import com.doumee.dao.system.dto.QuerySystemUserDTO;
@@ -70,6 +72,17 @@
        systemUserBiz.create(systemUser);
        return ApiResponse.success(null);
    }

    @Trace(withRequestParameters = false)
    @PreventRepeat
    @ApiOperation("新建企业或者商户账号")
    @PostMapping("/createCompany")
    @RequiresPermissions("system:user:create")
    public ApiResponse createCompany(@Validated(OperaType.Create.class) @RequestBody CreateSystemUserDTO systemUser) {
        systemUser.setCreateUser(this.getLoginUser().getId());
        systemUserBiz.createCompany(systemUser);
        return ApiResponse.success(null);
    }
    @PreventRepeat
    @ApiOperation("修改用户状态")
    @GetMapping("/updUserStatus")
@@ -117,6 +130,15 @@
    public ApiResponse<PageData<SystemUserListVO>> findPage (@RequestBody PageWrap<QuerySystemUserDTO> pageWrap) {
        return ApiResponse.success(systemUserService.findPage(pageWrap));
    }



    @ApiOperation("分页查询")
    @PostMapping("/pageCompany")
    @RequiresPermissions("system:user:query")
    public ApiResponse<PageData<SystemUserListVO>> findPageCompany (@RequestBody PageWrap<QuerySystemUserDTO> pageWrap) {
        return ApiResponse.success(systemUserService.findPageCompany(pageWrap));
    }
    @ApiOperation("分页查询系统用户")
    @PostMapping("/findAllPage")
    @RequiresPermissions("system:user:query")
@@ -139,4 +161,13 @@
        return ApiResponse.success(systemUserService.findById(id));
    }


    @ApiOperation("设置或取消主管")
    @PostMapping("/updateHead")
    @RequiresPermissions("system:user:query")
    public ApiResponse updateHead(@RequestBody SystemUser systemUser){
        systemUserService.updateHead(systemUser);
        return ApiResponse.success(null);
    }

}