From 35ba46370f5966dcfb6741d977e6273b25f212bf Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Mon, 10 Apr 2023 13:41:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E9=83=A8=E9=97=A8=E4=BF=A1=E6=81=AFbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/InvWarehouseController.java | 1 - .../controller/auth/SysUserController.java | 7 +++++- .../com/glxp/api/dao/auth/DeptUserDao.java | 2 ++ .../api/req/auth/FilterAuthUserRequest.java | 2 ++ .../api/service/auth/DeptUserService.java | 2 ++ .../auth/impl/DeptUserServiceImpl.java | 7 ++++++ .../mybatis/mapper/auth/DeptUserDao.xml | 25 +++++++++++++++++++ .../mybatis/mapper/auth/InvWarehouseDao.xml | 3 ++- 8 files changed, 46 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java index 2ad2f61e..2c4da505 100644 --- a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java +++ b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java @@ -71,7 +71,6 @@ public class InvWarehouseController extends BaseController { return ResultVOUtils.success(responses); } - /** * 获取部门底下仓库列表-关联用户 * diff --git a/src/main/java/com/glxp/api/controller/auth/SysUserController.java b/src/main/java/com/glxp/api/controller/auth/SysUserController.java index 045855aa..0d32c91a 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysUserController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysUserController.java @@ -67,7 +67,12 @@ public class SysUserController extends BaseController { AuthAdminResponse authAdminResponse = new AuthAdminResponse(); BeanUtils.copyProperties(item, authAdminResponse); List roles = sysRoleService.selectRoleListByUserId(authAdminResponse.getId()); - List deptUserResponses = deptUserService.selectByUserId(authAdminResponse.getId()); + List deptUserResponses=null; + if("key".equals(filterAuthUserRequest.getKey())){ + deptUserResponses = deptUserService.selectByUserIdKey(authAdminResponse.getId()); + }else{ + deptUserResponses = deptUserService.selectByUserId(authAdminResponse.getId()); + } if (CollUtil.isNotEmpty(deptUserResponses)) { List depts = new ArrayList<>(); String deptName = ""; diff --git a/src/main/java/com/glxp/api/dao/auth/DeptUserDao.java b/src/main/java/com/glxp/api/dao/auth/DeptUserDao.java index dc10b7ef..b43f8987 100644 --- a/src/main/java/com/glxp/api/dao/auth/DeptUserDao.java +++ b/src/main/java/com/glxp/api/dao/auth/DeptUserDao.java @@ -16,6 +16,8 @@ public interface DeptUserDao { List selectJoinDeptUser(FilterDeptUserReqeust filterDeptUserReqeust); + List selectJoinDeptUserKey(FilterDeptUserReqeust filterDeptUserReqeust); + boolean delete(@Param("deptId") Long deptId, @Param("userId") Long userId); int deleteById(Integer id); diff --git a/src/main/java/com/glxp/api/req/auth/FilterAuthUserRequest.java b/src/main/java/com/glxp/api/req/auth/FilterAuthUserRequest.java index 2583f67e..d3f46a12 100644 --- a/src/main/java/com/glxp/api/req/auth/FilterAuthUserRequest.java +++ b/src/main/java/com/glxp/api/req/auth/FilterAuthUserRequest.java @@ -33,4 +33,6 @@ public class FilterAuthUserRequest extends ListPageRequest { private String deptCode; private String invCode; //仓库号 + private String key; + } diff --git a/src/main/java/com/glxp/api/service/auth/DeptUserService.java b/src/main/java/com/glxp/api/service/auth/DeptUserService.java index c6875904..b8ce4781 100644 --- a/src/main/java/com/glxp/api/service/auth/DeptUserService.java +++ b/src/main/java/com/glxp/api/service/auth/DeptUserService.java @@ -15,6 +15,8 @@ public interface DeptUserService { List selectByUserId(Long userId); + List selectByUserIdKey(Long userId); + List getDeptById( List ids); List selectJoinDeptUser(FilterDeptUserReqeust filterDeptUserReqeust); diff --git a/src/main/java/com/glxp/api/service/auth/impl/DeptUserServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/DeptUserServiceImpl.java index 73814f88..1e3eb700 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/DeptUserServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/DeptUserServiceImpl.java @@ -42,6 +42,13 @@ public class DeptUserServiceImpl implements DeptUserService { return deptUserDao.selectJoinDeptUser(filterDeptUserReqeust); } + @Override + public List selectByUserIdKey(Long userId) { + FilterDeptUserReqeust filterDeptUserReqeust = new FilterDeptUserReqeust(); + filterDeptUserReqeust.setUserId(userId); + return deptUserDao.selectJoinDeptUserKey(filterDeptUserReqeust); + } + @Override public List getDeptById(List ids) { return deptDao.getDeptById(ids); diff --git a/src/main/resources/mybatis/mapper/auth/DeptUserDao.xml b/src/main/resources/mybatis/mapper/auth/DeptUserDao.xml index de48fd49..a6a49fe1 100644 --- a/src/main/resources/mybatis/mapper/auth/DeptUserDao.xml +++ b/src/main/resources/mybatis/mapper/auth/DeptUserDao.xml @@ -41,7 +41,32 @@ auth_user.employeeName like concat('%', #{key}, '%')) + group by auth_dept_user.userId + + diff --git a/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml b/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml index 4ba50312..f7590b95 100644 --- a/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml +++ b/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml @@ -299,7 +299,8 @@ AND a.advanceType = #{advanceType} - AND a.name like concat('%', #{key}, '%') + AND (a.name like concat('%', #{key}, '%') or + a.code = #{key})