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; + }