From 1738822d07fe74f94422b4a3bad5291b3976a365 Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Sun, 25 Aug 2024 16:21:39 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=87=AA=E5=8A=A8=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=B7=A5=E4=BD=8D=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/basic/BasicCollectUserController.java | 6 +++++- .../com/glxp/api/req/basic/BasicCollectUserRequest.java | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/controller/basic/BasicCollectUserController.java b/src/main/java/com/glxp/api/controller/basic/BasicCollectUserController.java index 471e06dc0..d43f37488 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicCollectUserController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicCollectUserController.java @@ -3,6 +3,7 @@ package com.glxp.api.controller.basic; import com.github.pagehelper.PageInfo; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.controller.BaseController; import com.glxp.api.entity.basic.BasicCollectPointEntity; import com.glxp.api.entity.basic.BasicCollectUserEntity; import com.glxp.api.req.basic.BasicCollectRequest; @@ -28,13 +29,16 @@ import java.util.List; */ @Slf4j @RestController -public class BasicCollectUserController { +public class BasicCollectUserController extends BaseController { @Resource private BasicCollectUserService basicCollectUserService; @GetMapping("/udiwms/sysWorkplace/getUserBindWork") public BaseResponse getUserBindWork(BasicCollectUserRequest request) { + if (request.getAutoUserId() == 1){ + request.setUserId(String.valueOf(getUserId())); + } List page = basicCollectUserService.filterList(request); PageInfo pageInfo = new PageInfo<>(page); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); diff --git a/src/main/java/com/glxp/api/req/basic/BasicCollectUserRequest.java b/src/main/java/com/glxp/api/req/basic/BasicCollectUserRequest.java index 0b8edd230..1746bfb20 100644 --- a/src/main/java/com/glxp/api/req/basic/BasicCollectUserRequest.java +++ b/src/main/java/com/glxp/api/req/basic/BasicCollectUserRequest.java @@ -21,5 +21,7 @@ public class BasicCollectUserRequest extends ListPageRequest { private String userKey; private String workKey; + private Integer autoUserId; + }