Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-14 13:42:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

角色管理-分配用户接口参数修改

Browse Source
This commit is contained in:
liuzhaotian
2025-03-18 09:33:17 +08:00
parent 1ee9058f29
commit 452bb73f2c
1 changed files with 4 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/user/UserController.java
+4 -20
View File
@@ -12,14 +12,6 @@ import com.cf.imes.framework.mybatis.core.query.MPJLambdaWrapperX;
import com.cf.imes.framework.operatelog.core.annotations.OperateLog; import com.cf.imes.framework.operatelog.core.annotations.OperateLog;
import com.cf.imes.framework.organ.core.context.OrganContextHolder; import com.cf.imes.framework.organ.core.context.OrganContextHolder;
import com.cf.imes.module.system.controller.admin.user.vo.user.*; import com.cf.imes.module.system.controller.admin.user.vo.user.*;
import com.cf.imes.module.system.controller.admin.user.vo.user.UserImportExcelVO;
import com.cf.imes.module.system.controller.admin.user.vo.user.UserImportRespVO;
import com.cf.imes.module.system.controller.admin.user.vo.user.UserPageReqVO;
import com.cf.imes.module.system.controller.admin.user.vo.user.UserRespVO;
import com.cf.imes.module.system.controller.admin.user.vo.user.UserSaveReqVO;
import com.cf.imes.module.system.controller.admin.user.vo.user.UserSimpleRespVO;
import com.cf.imes.module.system.controller.admin.user.vo.user.UserUpdatePasswordReqVO;
import com.cf.imes.module.system.controller.admin.user.vo.user.UserUpdateStatusReqVO;
import com.cf.imes.module.system.convert.user.UserConvert; import com.cf.imes.module.system.convert.user.UserConvert;
import com.cf.imes.module.system.dal.dataobject.dept.DeptDO; import com.cf.imes.module.system.dal.dataobject.dept.DeptDO;
import com.cf.imes.module.system.dal.dataobject.dept.PostDO; import com.cf.imes.module.system.dal.dataobject.dept.PostDO;
@@ -42,7 +34,6 @@ import javax.annotation.Resource;
import javax.annotation.security.PermitAll; import javax.annotation.security.PermitAll;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid; import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
@@ -121,7 +112,7 @@ public class UserController {
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得用户分页列表") @Operation(summary = "获得用户分页列表")
@PreAuthorize("@ss.hasAnyPermissions('system:user:query','base:user:query','system:permission:assign-user-role','base:permission:assign-user-role')") @PreAuthorize("@ss.hasAnyPermissions('system:user:query','base:user:query')")
public CommonResult<PageResult<UserRespVO>> getUserPage(@Valid UserPageReqVO pageReqVO) { public CommonResult<PageResult<UserRespVO>> getUserPage(@Valid UserPageReqVO pageReqVO) {
// 获得用户分页列表 // 获得用户分页列表
PageResult<AdminUserDO> pageResult = userService.getUserPage(pageReqVO); PageResult<AdminUserDO> pageResult = userService.getUserPage(pageReqVO);
@@ -138,19 +129,12 @@ public class UserController {
@GetMapping("/divide-user") @GetMapping("/divide-user")
@Operation(summary = "角色管理-分配用户") @Operation(summary = "角色管理-分配用户")
@Parameter(name = "organId", description = "组织ID", required = true) @PreAuthorize("@ss.hasAnyPermissions('system:permission:assign-user-role','base:permission:assign-user-role')")
public CommonResult<List<UserRespVO>> getDivideUser(@Valid @RequestParam("organId") @NotNull(message = "组织ID不能为空") Long organId) { public CommonResult<PageResult<UserRespVO>> getDivideUser(@Valid UserPageReqVO pageReqVO) {
UserPageReqVO pageReqVO = new UserPageReqVO();
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
pageReqVO.setOrganId(organId); return getUserPage(pageReqVO);
PageResult<AdminUserDO> pageResult = userService.getUserPage(pageReqVO);
List<AdminUserDO> list = pageResult.getList();
if (CollUtil.isEmpty(list)) {
return success(new ArrayList<>());
}
return success(BeanUtils.toBean(list, UserRespVO.class));
} }