From 66bea1c27fb418270927d4e74c9e496aafa7b0c6 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Tue, 20 Dec 2022 16:33:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/auth/AuthAdminController.java | 12 ++++++++++-- .../admin/controller/inout/WareHouseController.java | 2 +- .../admin/dao/inout/WarehouseBussinessTypeDao.java | 2 ++ .../glxp/api/admin/dao/inout/WarehouseUserDao.java | 1 + .../admin/service/inout/WarehouseUserService.java | 3 +++ .../service/inout/impl/WarehouseUserServiceImpl.java | 7 +++++++ .../mapper/inout/WarehouseBussinessTypeDao.xml | 1 + .../mybatis/mapper/inout/WarehouseUserDao.xml | 8 +++++++- 8 files changed, 32 insertions(+), 4 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthAdminController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthAdminController.java index c3a2e36d..dd5e6e27 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthAdminController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthAdminController.java @@ -14,6 +14,7 @@ import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.res.auth.AuthAdminResponse; import com.glxp.api.admin.res.auth.AuthAdminRoleResponse; import com.glxp.api.admin.service.auth.*; +import com.glxp.api.admin.service.inout.WarehouseUserService; import com.glxp.api.admin.service.inventory.InvSubWarehouseService; import com.glxp.api.admin.util.GennerOrderUtils; import com.glxp.api.admin.util.PasswordUtils; @@ -52,6 +53,11 @@ public class AuthAdminController { @Resource private CustomerService customerService; + @Resource + private WarehouseUserService warehouseUserService; + + + /** * 获取管理员列表 */ @@ -267,14 +273,16 @@ public class AuthAdminController { if (authAdminSaveRequest.getId() == null) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "参数错误！"); } - + // 先得到要删除角色的 getLocSubInvCode + AuthAdmin byId = authAdminService.findById(authAdminSaveRequest.getId()); boolean b = authAdminService.deleteById(authAdminSaveRequest.getId()); if (!b) { return ResultVOUtils.error(ResultEnum.NOT_NETWORK); } + // 先删除之前的角色 authRoleAdminService.deleteByAdminId(authAdminSaveRequest.getId()); - + warehouseUserService.deleteByCodeAndId(authAdminSaveRequest.getId(),byId.getLocSubInvCode()); return ResultVOUtils.success(); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java index 4a10a8ec..e65a8617 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java @@ -1287,7 +1287,7 @@ public class WareHouseController { continue; } } - if (!isExit) { + if (isExit) { filteBusTypes.put(invBusUserEntity.getUserId(), invBusUserEntity); } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/WarehouseBussinessTypeDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inout/WarehouseBussinessTypeDao.java index 7a1f8c58..b68c323b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/WarehouseBussinessTypeDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inout/WarehouseBussinessTypeDao.java @@ -37,6 +37,8 @@ public interface WarehouseBussinessTypeDao { void deleteByCode(@Param("code") String code); + + /** * 根据单据类型编码查询单据类型列表 * diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/WarehouseUserDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inout/WarehouseUserDao.java index 7720be50..f57841c7 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/WarehouseUserDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inout/WarehouseUserDao.java @@ -8,6 +8,7 @@ import java.util.List; public interface WarehouseUserDao { int deleteByPrimaryKey(Integer id); + int deleteByCodeAndId(@Param("id") Long id,@Param("code") String code); List filterList(FilterInvUserRequest filterInvUserRequest); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/WarehouseUserService.java b/api-admin/src/main/java/com/glxp/api/admin/service/inout/WarehouseUserService.java index 42242e83..81c79011 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inout/WarehouseUserService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inout/WarehouseUserService.java @@ -5,6 +5,7 @@ import com.glxp.api.admin.entity.auth.AuthAdmin; import com.glxp.api.admin.entity.inout.WarehouseUserEntity; import com.glxp.api.admin.req.inventory.FilterInvLinkDataRequest; import com.glxp.api.admin.req.inventory.FilterInvUserRequest; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -49,6 +50,8 @@ public interface WarehouseUserService { */ void deleteWarehouseUser(Integer id); + void deleteByCodeAndId(Long id, String code); + /** * 查询分仓关联的用户列表 * diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/WarehouseUserServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/WarehouseUserServiceImpl.java index 8cc8f8b6..b5670a16 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/WarehouseUserServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/WarehouseUserServiceImpl.java @@ -105,6 +105,13 @@ public class WarehouseUserServiceImpl implements WarehouseUserService { } } + @Override + public void deleteByCodeAndId(Long id, String code) { + if(null !=id && null !=code){ + warehouseUserDao.deleteByCodeAndId(id,code); + } + } + @Override public List getWarehouseUserList(FilterInvLinkDataRequest filterInvLinkDataRequest) { if (filterInvLinkDataRequest == null) { diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseBussinessTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseBussinessTypeDao.xml index 3c361699..18559df6 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseBussinessTypeDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseBussinessTypeDao.xml @@ -25,6 +25,7 @@ delete from inv_warehouse_bussiness_type where id = #{id,jdbcType=INTEGER} + diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseUserDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseUserDao.xml index 90b22a52..28ef981b 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseUserDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseUserDao.xml @@ -9,10 +9,11 @@ + - id, code, userId, userName, isDirector + id, code, userId, userName, isDirector,locSubInvCode