From 4ca132aabe77d5015535ae04c8ab7a9036a92b41 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Sun, 23 Apr 2023 13:40:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=20=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/auth/DeptUserController.java | 29 +++++++++++++++++ .../controller/auth/SysUserController.java | 32 ++++++++++++++----- .../api/service/inout/IoOrderService.java | 2 ++ .../inout/impl/IoOrderServiceImpl.java | 6 ++++ 4 files changed, 61 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/auth/DeptUserController.java b/src/main/java/com/glxp/api/controller/auth/DeptUserController.java index 2a49d387e..83b597dc0 100644 --- a/src/main/java/com/glxp/api/controller/auth/DeptUserController.java +++ b/src/main/java/com/glxp/api/controller/auth/DeptUserController.java @@ -6,11 +6,14 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.entity.auth.DeptEntity; import com.glxp.api.entity.auth.DeptUserEntity; +import com.glxp.api.entity.inout.IoOrderEntity; import com.glxp.api.req.auth.FilterDeptUserReqeust; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.auth.DeptUserResponse; import com.glxp.api.service.auth.DeptService; import com.glxp.api.service.auth.DeptUserService; +import com.glxp.api.service.auth.WarehouseUserService; +import com.glxp.api.service.inout.IoOrderService; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -28,6 +31,12 @@ public class DeptUserController { @Resource DeptService deptService; + @Resource + IoOrderService ioOrderService; + + @Resource + WarehouseUserService warehouseUserService; + @AuthRuleAnnotation("") @GetMapping("udi/auth/dept/user/filter") @@ -52,6 +61,26 @@ public class DeptUserController { @AuthRuleAnnotation("") @PostMapping("udi/auth/dept/user/delete") public BaseResponse delete(@RequestBody DeptUserEntity deptUserEntity) { + + // 判断此用户是否创建单据 + List ioOrderEntities = ioOrderService.selectList(deptUserEntity.getUserId()); + if( ioOrderEntities != null){ + return ResultVOUtils.error(500,"该用户已创建单据,不能移除!"); + } + //判断此用户是否与仓库有关联 + List listWareHouse = warehouseUserService.selectCodeByUser(deptUserEntity.getUserId() + ""); + if( listWareHouse != null ){ + return ResultVOUtils.error(500,"该用户已绑定仓库,不能移除!"); + } + + //判断此用户是否与除一级部门 还绑定其他部门 + FilterDeptUserReqeust filterDeptUserReqeust = new FilterDeptUserReqeust(); + filterDeptUserReqeust.setUserId(deptUserEntity.getUserId()); + List deptUserEntities = deptUserService.selectDeptUser(filterDeptUserReqeust); + if( deptUserEntities != null && deptUserEntities.size()>1){ + return ResultVOUtils.error(500,"该用户已绑定多个部门,不能移除!"); + } + boolean b = deptUserService.delete(deptUserEntity.getDeptId(), deptUserEntity.getUserId()); if (b) return ResultVOUtils.success("移除成功！"); 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 849267f38..2b2ddba67 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysUserController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysUserController.java @@ -6,14 +6,18 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.Log; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BusinessType; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.auth.DeptUserEntity; import com.glxp.api.entity.auth.SysRole; import com.glxp.api.entity.auth.WarehouseUserEntity; -import com.glxp.api.req.auth.FilterAuthUserRequest; import com.glxp.api.req.auth.AuthUserSaveRequest; +import com.glxp.api.req.auth.FilterAuthUserRequest; +import com.glxp.api.req.auth.FilterDeptUserReqeust; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.auth.AuthAdminResponse; import com.glxp.api.res.auth.DeptUserResponse; @@ -23,13 +27,9 @@ import com.glxp.api.service.auth.ISysRoleService; import com.glxp.api.service.auth.WarehouseUserService; import com.glxp.api.util.PasswordUtils; import com.glxp.api.util.StreamUtils; -import com.glxp.api.common.enums.ResultEnum; -import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.util.StringUtils; import lombok.RequiredArgsConstructor; import org.springframework.beans.BeanUtils; -import org.springframework.transaction.annotation.EnableTransactionManagement; import org.springframework.validation.BindingResult; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -264,9 +264,25 @@ public class SysUserController extends BaseController { userService.updateAuthAdmin(authAdmin); //默认插入第一部门 - List deptCodeList=authUserSaveRequest.getDepts(); - deptCodeList.add(1L); - authUserSaveRequest.setDepts(deptCodeList); + List deptCodeList = null; + FilterDeptUserReqeust filterDeptUserReqeust = new FilterDeptUserReqeust(); + filterDeptUserReqeust.setUserId(authUserSaveRequest.getId()); + List deptUserEntities = deptUserService.selectDeptUser(filterDeptUserReqeust); + if(deptUserEntities == null){ + deptCodeList.add(1L); + authUserSaveRequest.setDepts(deptCodeList); + }else{ + Boolean checkDeptId=false; + for (DeptUserEntity deptUserEntity : deptUserEntities) { + if(deptUserEntity.getDeptId() == 1){ + checkDeptId=true; + } + } + if(checkDeptId==false){ + deptCodeList.add(1L); + authUserSaveRequest.setDepts(deptCodeList); + } + } //修改所属部门 deptUserService.deleteByUser(authUserSaveRequest.getId()); diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderService.java b/src/main/java/com/glxp/api/service/inout/IoOrderService.java index 7eb96125a..6d8bba0f2 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderService.java @@ -133,4 +133,6 @@ public interface IoOrderService { * @return */ BaseResponse submitOrderToThrSys(ThrSystemDetailEntity thrSystemDetailEntity); + + List selectList(Long userId); } diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java index c6a5acf62..15ebc2e0c 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java @@ -831,6 +831,12 @@ public class IoOrderServiceImpl implements IoOrderService { return ResultVOUtils.success("单据提交完成"); } + @Override + public List selectList(Long userId) { + List ioOrderEntities = orderDao.selectList(new QueryWrapper().eq("createUser",userId)); + return ioOrderEntities; + } + /** * 查询此单据关联的所有单据 *