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

Merge remote-tracking branch 'origin/bonus-jyy-smart-canteen' into bonus-jyy-smart-canteen

This commit is contained in:
lizhenhua 2025-09-15 10:20:34 +08:00
parent 254ab2b3c7 efd7e265b2
commit bc54bd9f70
3 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/RemoteUserService.java
View File

@ -31,9 +31,6 @@ public interface RemoteUserService {
@GetMapping("/user/list}") @GetMapping("/user/list}")
public TableDataInfo list(SysUser user, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); public TableDataInfo list(SysUser user, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
@GetMapping("/user/list_all}")
public TableDataInfo listAll(SysUser user, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
/** /**
* 通过用户名查询用户信息 * 通过用户名查询用户信息
* *

4
bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteUserFallbackFactory.java
View File

@ -38,10 +38,6 @@ public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserServ
return getDataTableError(new ArrayList<SysUser>()); return getDataTableError(new ArrayList<SysUser>());
} }
@Override
public TableDataInfo listAll(SysUser user, String source) {
return getDataTableError(new ArrayList<SysUser>());
}
@Override @Override
public R<LoginUser> getUserInfo(String username, String source) public R<LoginUser> getUserInfo(String username, String source)

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

@ -95,20 +95,6 @@ public class SysUserController extends BaseController {
} }
return getDataTableError(new ArrayList<>()); return getDataTableError(new ArrayList<>());
} }
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("system:user:list"))
@GetMapping("/list_all")
@SysLog(title = "用户管理", businessType = OperaType.QUERY, logType = 0, module = "系统管理->用户管理", details = "查询用户列表")
public TableDataInfo listAll(SysUser user) {
try {
user .setQueryTyoe(2);
List<SysUser> list = userService.selectUserList(user);
return getDataTable(list);
} catch (Exception e) {
logger.error(e.toString(), e);
}
return getDataTableError(new ArrayList<>());
}
@RequiresPermissions("system:user:export") @RequiresPermissions("system:user:export")
@PostMapping("/export") @PostMapping("/export")