bonus
/
Bonus-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

运检食堂需求

This commit is contained in:
sxu 2025-04-11 10:58:37 +08:00
parent 0980714dfb
commit 54f3855a28
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java
View File

@ -155,6 +155,7 @@ public class SysUser extends BaseEntity {
/**是否内置，0内置，1非内置*/ /**是否内置，0内置，1非内置*/
private String isBuiltIn = "1"; private String isBuiltIn = "1";
private boolean pagination;
@ApiModelProperty("人员id") @ApiModelProperty("人员id")
@JsonFormat(shape = JsonFormat.Shape.STRING) @JsonFormat(shape = JsonFormat.Shape.STRING)
@ -433,4 +434,12 @@ public class SysUser extends BaseEntity {
public void setIsBuiltIn(String isBuiltIn) { public void setIsBuiltIn(String isBuiltIn) {
this.isBuiltIn = isBuiltIn; this.isBuiltIn = isBuiltIn;
} }
public boolean isPagination() {
return pagination;
}
public void setPagination(boolean pagination) {
this.pagination = pagination;
}
} }

8
bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysUserController.java
View File

@ -81,7 +81,9 @@ public class SysUserController extends BaseController {
@SysLog(title = "用户管理", businessType = OperaType.QUERY, logType = 0, module = "系统管理->用户管理", details = "查询用户列表") @SysLog(title = "用户管理", businessType = OperaType.QUERY, logType = 0, module = "系统管理->用户管理", details = "查询用户列表")
public TableDataInfo list(SysUser user) { public TableDataInfo list(SysUser user) {
try { try {
startPage(); if (user.isPagination()) {
startPage();
}
List<SysUser> list = userService.selectUserList(user); List<SysUser> list = userService.selectUserList(user);
return getDataTable(list); return getDataTable(list);
} catch (Exception e) { } catch (Exception e) {
@ -491,7 +493,7 @@ public class SysUserController extends BaseController {
/** /**
* 获取部门树列表 * 获取部门树列表
*/ */
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("system:user:list")) //@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("system:user:list"))
@GetMapping("/deptTree") @GetMapping("/deptTree")
public AjaxResult deptTree(SysDept dept) { public AjaxResult deptTree(SysDept dept) {
try { try {
@ -505,7 +507,7 @@ public class SysUserController extends BaseController {
/** /**
* 查询部门人员树列表 * 查询部门人员树列表
*/ */
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("system:user:list")) //@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("system:user:list"))
@PostMapping("/deptUserTree") @PostMapping("/deptUserTree")
public AjaxResult deptUserTree(@RequestBody SysUser sysUser) { public AjaxResult deptUserTree(@RequestBody SysUser sysUser) {
try { try {