新增缺少的方法和参数

backend/src/main/java/com/stdproject/common/PageRequest.java

@@ -4,7 +4,7 @@ import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
-
+import java.util.List;
 
 /**
  * 分页查询请求类
@@ -43,6 +43,11 @@ public class PageRequest {
      */
     private String keyword;
 
+    /**
+     * 条件过滤器
+     */
+    private List<FilterCondition> filters;
+
     /**
      * 获取偏移量
      *

backend/src/main/java/com/stdproject/controller/AppMenuController.java

@@ -1,5 +1,6 @@
 package com.stdproject.controller;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -87,8 +88,10 @@ public class AppMenuController {
     @Operation(summary = "获取菜单树形结构")
     @GetMapping("/tree")
     @OperationLog(type = "06", module = "菜单管理", description = "获取菜单树形结构")
-    public Result<List<MenuTreeNode>> getMenuTree() {
+    public Result<List<MenuTreeNode>> getMenuTree(@RequestParam String appId,@RequestParam String name) {
         QueryWrapper<AppMenu> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(StrUtil.isNotBlank(appId),"app_id", appId);
+        queryWrapper.like(StrUtil.isNotBlank(name),"name", name);
         queryWrapper.orderByAsc("parentid", "orderno");
 
         List<AppMenu> allMenus = appMenuService.list(queryWrapper);

backend/src/main/java/com/stdproject/controller/AppOrganizationController.java

@@ -1,5 +1,6 @@
 package com.stdproject.controller;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -53,9 +54,11 @@ public class AppOrganizationController {
     @Operation(summary = "查询部门列表")
     @GetMapping("/getDepartmentList")
     @OperationLog(type = "06", module = "组织管理", description = "查询部门列表")
-    public Result<List<AppOrganization>> getDepartmentList(@RequestParam String parentid, @RequestParam String keystr) {
+    public Result<List<AppOrganization>> getDepartmentList(@RequestParam String appId, @RequestParam String orgtype,
+                                                           @RequestParam String parentid, @RequestParam String keystr) {
         QueryWrapper<AppOrganization> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("orgtype", "02");
+        queryWrapper.eq(StrUtil.isNotBlank(appId), "app_id", appId);
+        queryWrapper.eq(StrUtil.isNotBlank(orgtype), "orgtype", orgtype);
         queryWrapper.eq("parentid", parentid);
         queryWrapper.eq("isvaild", "1");
         if (StringUtils.hasText(keystr)) {

backend/src/main/java/com/stdproject/controller/AppRoleController.java

@@ -1,5 +1,6 @@
 package com.stdproject.controller;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -49,18 +50,19 @@ public class AppRoleController {
     private IAppRoleUserService appRoleUserService;
 
     @Operation(summary = "分页查询角色列表")
-    @PostMapping("/page")
+    @PostMapping("/page/{appId}")
     @OperationLog(type = "06", module = "角色管理", description = "分页查询角色列表")
-    public Result<IPage<AppRole>> page(@RequestBody @Valid PageRequest pageRequest) {
+    public Result<IPage<AppRole>> page(@Parameter(description = "用户ID") @PathVariable String appId,
+                                       @RequestBody @Valid PageRequest pageRequest) {
         Page<AppRole> page = new Page<>(pageRequest.getCurrent(), pageRequest.getSize());
         QueryWrapper<AppRole> queryWrapper = new QueryWrapper<>();
-        
+        queryWrapper.eq(StrUtil.isNotBlank(appId),"app_id",appId);
         // 关键字搜索
         if (StringUtils.hasText(pageRequest.getKeyword())) {
             queryWrapper.and(wrapper -> wrapper
-                .like("rolename", pageRequest.getKeyword())
+                    .like("rolename", pageRequest.getKeyword())
-                .or().like("rolecode", pageRequest.getKeyword())
+                    .or().like("rolecode", pageRequest.getKeyword())
-                .or().like("description", pageRequest.getKeyword())
+                    .or().like("description", pageRequest.getKeyword())
             );
         }
 
@@ -101,6 +103,7 @@ public class AppRoleController {
         AppRole role = appRoleService.getById(id);
         return Result.success(role);
     }
+
     @Operation(summary = "新增角色")
     @PostMapping
     @OperationLog(type = "01", module = "角色管理", description = "新增角色")
@@ -133,6 +136,7 @@ public class AppRoleController {
 
     /**
      * 获取最大的角色编号
+     *
      * @return 最大角色编号
      */
     private String getMaxRoleCode() {
@@ -204,8 +208,6 @@ public class AppRoleController {
         return Result.error("角色不存在");
     }
 
-    
-
     @Operation(summary = "根据角色类型查询角色列表")
     @GetMapping("/type/{type}")
     @OperationLog(type = "06", module = "角色管理", description = "根据角色类型查询角色列表")
@@ -262,8 +264,8 @@ public class AppRoleController {
 
         List<AppRoleMenu> roleMenus = appRoleMenuService.list(queryWrapper);
         List<String> menuIds = roleMenus.stream()
-            .map(AppRoleMenu::getMenuid)
+                .map(AppRoleMenu::getMenuid)
-            .collect(Collectors.toList());
+                .collect(Collectors.toList());
 
         return Result.success(menuIds);
     }
@@ -312,8 +314,8 @@ public class AppRoleController {
 
         List<AppRoleUser> roleUsers = appRoleUserService.list(queryWrapper);
         List<String> userIds = roleUsers.stream()
-            .map(AppRoleUser::getUserid)
+                .map(AppRoleUser::getUserid)
-            .collect(Collectors.toList());
+                .collect(Collectors.toList());
 
         return Result.success(userIds);
     }

backend/src/main/java/com/stdproject/controller/AppUserController.java

@@ -1,10 +1,12 @@
 package com.stdproject.controller;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.stdproject.common.OperationLog;
 import com.stdproject.common.PageRequest;
+import com.stdproject.common.QueryWrapperBuilder;
 import com.stdproject.common.Result;
 import com.stdproject.entity.AppUser;
 import com.stdproject.service.IAppUserService;
@@ -37,19 +39,22 @@ public class AppUserController {
     private IAppUserService appUserService;
 
     @Operation(summary = "分页查询用户列表")
-    @PostMapping("/page")
+    @PostMapping("/page/{orgId}/{appId}")
     @OperationLog(type = "06", module = "用户管理", description = "分页查询用户列表")
-    public Result<IPage<AppUser>> page(@RequestBody @Valid PageRequest pageRequest) {
+    public Result<IPage<AppUser>> page(@Parameter(description = "用户ID") @PathVariable String orgId,
+                                       @Parameter(description = "用户ID") @PathVariable String appId,
+                                       @RequestBody @Valid PageRequest pageRequest) {
         Page<AppUser> page = new Page<>(pageRequest.getCurrent(), pageRequest.getSize());
         QueryWrapper<AppUser> queryWrapper = new QueryWrapper<>();
-        
+        queryWrapper.eq(StrUtil.isNotBlank(orgId),"orgid",orgId);
+        queryWrapper.eq(StrUtil.isNotBlank(appId),"app_id",appId);
         // 关键字搜索
         if (StringUtils.hasText(pageRequest.getKeyword())) {
             queryWrapper.and(wrapper -> wrapper
-                .like("username", pageRequest.getKeyword())
+                    .like("username", pageRequest.getKeyword())
-                .or().like("nickname", pageRequest.getKeyword())
+                    .or().like("nickname", pageRequest.getKeyword())
-                .or().like("email", pageRequest.getKeyword())
+                    .or().like("email", pageRequest.getKeyword())
-                .or().like("phone", pageRequest.getKeyword())
+                    .or().like("phone", pageRequest.getKeyword())
             );
         }
 
@@ -254,24 +259,42 @@ public class AppUserController {
      * 密码修改请求类
      */
     public static class PasswordUpdateRequest {
+
         private String oldPassword;
         private String newPassword;
 
         // getters and setters
-        public String getOldPassword() { return oldPassword; }
+        public String getOldPassword() {
-        public void setOldPassword(String oldPassword) { this.oldPassword = oldPassword; }
+            return oldPassword;
-        public String getNewPassword() { return newPassword; }
+        }
-        public void setNewPassword(String newPassword) { this.newPassword = newPassword; }
+
+        public void setOldPassword(String oldPassword) {
+            this.oldPassword = oldPassword;
+        }
+
+        public String getNewPassword() {
+            return newPassword;
+        }
+
+        public void setNewPassword(String newPassword) {
+            this.newPassword = newPassword;
+        }
     }
 
     /**
      * 密码重置请求类
      */
     public static class PasswordResetRequest {
+
         private String newPassword;
 
         // getters and setters
-        public String getNewPassword() { return newPassword; }
+        public String getNewPassword() {
-        public void setNewPassword(String newPassword) { this.newPassword = newPassword; }
+            return newPassword;
+        }
+
+        public void setNewPassword(String newPassword) {
+            this.newPassword = newPassword;
+        }
     }
 }