From f5ab83dfad01c87828232af8cd18c676e69fd917 Mon Sep 17 00:00:00 2001 From: MrShi <1878285526@qq.com> Date: 星期三, 21 五月 2025 09:14:11 +0800 Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit --- server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/ProjectsCloudController.java | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/ProjectsCloudController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/ProjectsCloudController.java index ae7b0bf..f33b0af 100644 --- a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/ProjectsCloudController.java +++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/ProjectsCloudController.java @@ -4,9 +4,9 @@ import com.doumee.config.annotation.CloudRequiredPermission; import com.doumee.core.annotation.excel.ExcelExporter; import com.doumee.core.annotation.pr.PreventRepeat; -import com.doumee.core.model.ApiResponse; -import com.doumee.core.model.PageData; -import com.doumee.core.model.PageWrap; +import com.doumee.service.business.third.model.ApiResponse; +import com.doumee.service.business.third.model.PageData; +import com.doumee.service.business.third.model.PageWrap; import com.doumee.core.utils.Constants; import com.doumee.dao.business.model.Projects; import com.doumee.dao.web.response.ProjectsResponse; @@ -19,6 +19,7 @@ import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.List; +import java.util.Map; /** * @author 姹熻箘韫� @@ -93,13 +94,12 @@ return ApiResponse.success(projectsService.findById(id)); } - - @ApiOperation("浼氳鍏宠仈鐨勯」鐩�") @PostMapping("/findListByObjId") @CloudRequiredPermission("business:projects:query") - public ApiResponse<List<ProjectsResponse>> findListByObjId (@RequestParam Integer objId, @RequestParam Integer objType, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) { - return ApiResponse.success(projectsService.getProjectsList(objId,objType)); + public ApiResponse<List<ProjectsResponse>> findListByObjId (@RequestBody Map<String,Object> param, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) { +// @RequestParam Integer objId, @RequestParam Integer objType, + return ApiResponse.success(projectsService.getProjectsList((Integer) param.get("objId"), (Integer) param.get("objType"))); } } -- Gitblit v1.9.3