运检食堂需求
This commit is contained in:
parent
0980714dfb
commit
54f3855a28
|
|
@ -155,6 +155,7 @@ public class SysUser extends BaseEntity {
|
|||
/**是否内置,0内置,1非内置*/
|
||||
private String isBuiltIn = "1";
|
||||
|
||||
private boolean pagination;
|
||||
|
||||
@ApiModelProperty("人员id")
|
||||
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||
|
|
@ -433,4 +434,12 @@ public class SysUser extends BaseEntity {
|
|||
public void setIsBuiltIn(String isBuiltIn) {
|
||||
this.isBuiltIn = isBuiltIn;
|
||||
}
|
||||
|
||||
public boolean isPagination() {
|
||||
return pagination;
|
||||
}
|
||||
|
||||
public void setPagination(boolean pagination) {
|
||||
this.pagination = pagination;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -81,7 +81,9 @@ public class SysUserController extends BaseController {
|
|||
@SysLog(title = "用户管理", businessType = OperaType.QUERY, logType = 0, module = "系统管理->用户管理", details = "查询用户列表")
|
||||
public TableDataInfo list(SysUser user) {
|
||||
try {
|
||||
startPage();
|
||||
if (user.isPagination()) {
|
||||
startPage();
|
||||
}
|
||||
List<SysUser> list = userService.selectUserList(user);
|
||||
return getDataTable(list);
|
||||
} 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")
|
||||
public AjaxResult deptTree(SysDept dept) {
|
||||
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")
|
||||
public AjaxResult deptUserTree(@RequestBody SysUser sysUser) {
|
||||
try {
|
||||
|
|
|
|||
Loading…
Reference in New Issue