From 437f8e2b89a18363a1073fdbb3ab99bcd840a757 Mon Sep 17 00:00:00 2001 From: “djh” <“3298565835@qq.com”> Date: 星期一, 21 四月 2025 10:51:36 +0800 Subject: [PATCH] 危化品新版修改 --- hazmat-system/src/main/java/com/gkhy/hazmat/system/service/impl/HzEntryRecordServiceImpl.java | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/hazmat-system/src/main/java/com/gkhy/hazmat/system/service/impl/HzEntryRecordServiceImpl.java b/hazmat-system/src/main/java/com/gkhy/hazmat/system/service/impl/HzEntryRecordServiceImpl.java index 2fb7c5c..bc85ce8 100644 --- a/hazmat-system/src/main/java/com/gkhy/hazmat/system/service/impl/HzEntryRecordServiceImpl.java +++ b/hazmat-system/src/main/java/com/gkhy/hazmat/system/service/impl/HzEntryRecordServiceImpl.java @@ -66,7 +66,7 @@ @Override public CommonPage selectEntryRecordList(HzEntryRecord entryRecord) { SysUser currentUser = SecurityUtils.getLoginUser().getUser(); - if (!currentUser.getUserType().equals(UserTypeEnum.SYSTEM_USER.getCode())) { + if (!currentUser.getUserType().equals(UserTypeEnum.SYSTEM_USER.getCode()) && !currentUser.getUserType().equals(UserTypeEnum.CHECK_USER.getCode())) { entryRecord.setCompanyId(currentUser.getCompanyId()); } PageUtils.startPage(); @@ -311,8 +311,12 @@ throw new ApiException("入库信息不存在"); } checkUserAllowed(entryRecord,currentUser); - //设置分表id - IdTableNameHandler.setCurrentId(currentUser.getCompanyId()); + if (currentUser.getUserType().equals(UserTypeEnum.CHECK_USER.getCode())){ + IdTableNameHandler.setCurrentId(entryRecord.getCompanyId()); + }else { + //设置分表id + IdTableNameHandler.setCurrentId(currentUser.getCompanyId()); + } PageUtils.startPage(); List<HzHazmat> hazmatList = hazmatMapper.selectHazmatList(new HzHazmat().setEntryId(entryId)); IdTableNameHandler.removeCurrentId(); @@ -324,8 +328,10 @@ throw new ApiException("管理员不能操作"); } if(entryRecord!=null){ - if(!Objects.equals(user.getCompanyId(), entryRecord.getCompanyId())){ - throw new ApiException("无权限操作其他企业数据"); + if (!user.getUserType().equals(UserTypeEnum.CHECK_USER.getCode())){ + if(!Objects.equals(user.getCompanyId(), entryRecord.getCompanyId())){ + throw new ApiException("无权限操作其他企业数据"); + } } } } -- Gitblit v1.9.2