From 4bb3ffb2740c2f5db5e72cf265303cedc8c186ef Mon Sep 17 00:00:00 2001 From: yewj Date: Thu, 31 Oct 2024 15:25:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E6=9D=BF=E5=B7=A5=E4=BD=8D=E4=B8=8A?= =?UTF-8?q?=E8=B4=A7=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/basic/BasicCollectUserController.java | 8 ++++---- src/main/java/com/glxp/api/entity/auth/SysWorkplace.java | 1 - .../java/com/glxp/api/res/basic/UserWorkResponse.java | 6 +++++- .../mybatis/mapper/basic/BasicCollectUserMapper.xml | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-) 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 f480da748..54ade4cf2 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicCollectUserController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicCollectUserController.java @@ -74,10 +74,10 @@ public class BasicCollectUserController extends BaseController { request.setUserId(String.valueOf(getUserId())); } BasicCollectUserEntity user = basicCollectUserService.getOne(new LambdaQueryWrapper() - .eq(BasicCollectUserEntity::getWorkplaceCode,request.getWorkplaceCode()) - .eq(BasicCollectUserEntity::getUserId,request.getUserId())); - if (user == null){ - return ResultVOUtils.error(500,"当前用户工位已被移除"); + .eq(BasicCollectUserEntity::getWorkplaceCode, request.getWorkplaceCode()) + .eq(BasicCollectUserEntity::getUserId, request.getUserId())); + if (user == null) { + return ResultVOUtils.error(500, "当前用户工位已被移除"); } return ResultVOUtils.success(); } diff --git a/src/main/java/com/glxp/api/entity/auth/SysWorkplace.java b/src/main/java/com/glxp/api/entity/auth/SysWorkplace.java index aa20787c1..81affc0da 100644 --- a/src/main/java/com/glxp/api/entity/auth/SysWorkplace.java +++ b/src/main/java/com/glxp/api/entity/auth/SysWorkplace.java @@ -113,7 +113,6 @@ public class SysWorkplace implements Serializable { private Integer queueStatus; - @TableField(exist = false) private String invName; diff --git a/src/main/java/com/glxp/api/res/basic/UserWorkResponse.java b/src/main/java/com/glxp/api/res/basic/UserWorkResponse.java index 958365879..6757eba25 100644 --- a/src/main/java/com/glxp/api/res/basic/UserWorkResponse.java +++ b/src/main/java/com/glxp/api/res/basic/UserWorkResponse.java @@ -78,7 +78,11 @@ public class UserWorkResponse { private String deptCodeName; private Integer workPlaceClass; - + private Integer workWorkPlaceClass; + /** + * 按照货位上架 0:关闭 1:启用 + */ + private Integer queueStatus; } diff --git a/src/main/resources/mybatis/mapper/basic/BasicCollectUserMapper.xml b/src/main/resources/mybatis/mapper/basic/BasicCollectUserMapper.xml index f1fcd52ea..5eecdd037 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicCollectUserMapper.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicCollectUserMapper.xml @@ -14,7 +14,7 @@ sw.workplaceStatus, sw.workplaceType, sw.invRemindNumber, - sw.workPlaceClass, + sw.workPlaceClass,sw.queueStatus, ad.name deptCodeName from basic_collect_user bcu left join auth_user au on bcu.userId = au.id