|
@@ -2022,18 +2022,33 @@ public class SysUserController {
|
|
|
/**
|
|
|
* 用户符合查询2
|
|
|
*/
|
|
|
- @PostMapping("/userComplexConditionTwo")
|
|
|
- public Result<IPage<SysUser>> userComplexConditionTwo(
|
|
|
- @RequestParam(name = "roleId", required = false) String roleId,
|
|
|
- @RequestParam(name = "deptId", required = false) String deptId,
|
|
|
- @RequestParam(name = "appId", required = false) String appId,
|
|
|
- @RequestParam(name = "relName", required = false) String relName,
|
|
|
- @RequestParam(name = "username", required = false) String username,
|
|
|
- @RequestParam(name = "pageNo", required = false) Integer pageNo,
|
|
|
- @RequestParam(name = "pageSize", required = false) Integer pageSize) {
|
|
|
+// @PostMapping("/userComplexConditionTwo")
|
|
|
+// public Result<IPage<SysUser>> userComplexConditionTwo(
|
|
|
+// @RequestParam(name = "roleId", required = false) String roleId,
|
|
|
+// @RequestParam(name = "deptId", required = false) String deptId,
|
|
|
+// @RequestParam(name = "appId", required = false) String appId,
|
|
|
+// @RequestParam(name = "relName", required = false) String relName,
|
|
|
+// @RequestParam(name = "username", required = false) String username,
|
|
|
+// @RequestParam(name = "pageNo", required = false) Integer pageNo,
|
|
|
+// @RequestParam(name = "pageSize", required = false) Integer pageSize) {
|
|
|
+//
|
|
|
+// Result<IPage<SysUser>> iPageResult = sysUserService.userComplexConditionTwoService(roleId, deptId, appId, relName, username, pageNo, pageSize);
|
|
|
+//
|
|
|
+// return iPageResult;
|
|
|
+//
|
|
|
+//
|
|
|
+// }
|
|
|
|
|
|
+ @PostMapping("/userComplexConditionTwo")
|
|
|
+ public Result<IPage<SysUser>> userComplexConditionTwo(@RequestBody Map<String, String> requestParam) {
|
|
|
+ String roleId = requestParam.get("roleId");
|
|
|
+ String deptId = requestParam.get("deptId");
|
|
|
+ String appId = requestParam.get("appId");
|
|
|
+ String relName = requestParam.get("relName");
|
|
|
+ String username = requestParam.get("username");
|
|
|
+ String pageNo = requestParam.get("pageNo");
|
|
|
+ String pageSize = requestParam.get("pageSize");
|
|
|
Result<IPage<SysUser>> iPageResult = sysUserService.userComplexConditionTwoService(roleId, deptId, appId, relName, username, pageNo, pageSize);
|
|
|
-
|
|
|
return iPageResult;
|
|
|
|
|
|
|